From patchwork Tue Sep 29 08:06:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7283171 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DAE28BEEA4 for ; Tue, 29 Sep 2015 08:03:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ECF6220503 for ; Tue, 29 Sep 2015 08:03:51 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 0ABAC206D2 for ; Tue, 29 Sep 2015 08:03:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 579D96EAD3; Tue, 29 Sep 2015 01:03:50 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2EA2E6EAD3 for ; Tue, 29 Sep 2015 01:03:47 -0700 (PDT) Received: by wicfx3 with SMTP id fx3so3321442wic.0 for ; Tue, 29 Sep 2015 01:03:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FXNCpPhFNG21reYz7p6+TwMZK8/fqnUeLDk2AZ88naU=; b=cF+gwhEUt+jYbSBflYvVTr/+rwR7jU7fp22vhCeYO/EeA8wVKjaM7vf+4tMZpKGLpy HK/VTETb1aE74ETVLMfc/isBzM/s07zpC+qfVp6gqhhtJ9YasWPHR+fbnxLMNHy9thjL 7m0HVPqERS6BCo9sR45hWFrcafcBhs5VUYtrY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FXNCpPhFNG21reYz7p6+TwMZK8/fqnUeLDk2AZ88naU=; b=j2WQ1+aqJF43GUUeL77TsE3do1ZIGs6zjL7d4bCkKK7dyveWUC/wM2LJPnCvsU/rTe EgUNS7WX3trRjnf/0v2IZvTBKs25F1c4Os67osl64+FTUIyDpsuN4o0C1k2TzfNwdQ6K yugWugBbfvTCCIFi1HGrYFMkoDabtDjuePvfpYCLzQP/Gp/bM2l3gZLg81IsmXLFqB4Q BFF2jJEKHLUXOB+xjTwiKOumQbg3nybmxdujwiSNAFWFDjOpUFQcP3cOf9XgZf9Xq+Kv nkjMjcef/GxbNLfe3x7/QCVktqcYBj0xu/97h9RQE2g1LPRQb1LbZ1NTdwBuzXuWaJjo AB5Q== X-Gm-Message-State: ALoCoQlmAN/aNVD/jKzwoAz6OuFTNuG56GEAH+I0/2gxitCxf3t9zMCTEHmjO12f1RwNVZY53JgV X-Received: by 10.180.11.175 with SMTP id r15mr24362596wib.74.1443513825778; Tue, 29 Sep 2015 01:03:45 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id gl4sm22473139wjb.29.2015.09.29.01.03.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Sep 2015 01:03:45 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 2/3] drm/sysfs: Grab lock for edid/modes_show Date: Tue, 29 Sep 2015 10:06:32 +0200 Message-Id: <1443513993-5228-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1443513993-5228-1-git-send-email-daniel.vetter@ffwll.ch> References: <1443512228-10764-1-git-send-email-daniel.vetter@ffwll.ch> <1443513993-5228-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We chase pointers/lists without taking the locks protecting them, which isn't that good. Fix it. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_sysfs.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 7506de0a75b4..d55e0d7a610d 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c @@ -261,23 +261,29 @@ static ssize_t edid_show(struct file *filp, struct kobject *kobj, struct drm_connector *connector = to_drm_connector(connector_dev); unsigned char *edid; size_t size; + ssize_t ret = 0; + mutex_lock(&connector->dev->mode_config.mutex); if (!connector->edid_blob_ptr) - return 0; + goto unlock; edid = connector->edid_blob_ptr->data; size = connector->edid_blob_ptr->length; if (!edid) - return 0; + goto unlock; if (off >= size) - return 0; + goto unlock; if (off + count > size) count = size - off; memcpy(buf, edid + off, count); - return count; + ret = count; + mutex_lock(&connector->dev->mode_config.mutex); +unlock: + + return ret; } static ssize_t modes_show(struct device *device, @@ -288,10 +294,12 @@ static ssize_t modes_show(struct device *device, struct drm_display_mode *mode; int written = 0; + mutex_lock(&connector->dev->mode_config.mutex); list_for_each_entry(mode, &connector->modes, head) { written += snprintf(buf + written, PAGE_SIZE - written, "%s\n", mode->name); } + mutex_unlock(&connector->dev->mode_config.mutex); return written; }