From patchwork Mon Nov 19 09:44:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 1765641 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id B2834DF264 for ; Mon, 19 Nov 2012 15:57:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B8A59E619A for ; Mon, 19 Nov 2012 07:57:51 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pa0-f49.google.com (mail-pa0-f49.google.com [209.85.220.49]) by gabe.freedesktop.org (Postfix) with ESMTP id D74E4E6064 for ; Mon, 19 Nov 2012 01:51:16 -0800 (PST) Received: by mail-pa0-f49.google.com with SMTP id bi1so422031pad.36 for ; Mon, 19 Nov 2012 01:51:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=YQqUpvxXIzIsmJhWSunvmwJ96oh2PWNZ301nKB+xKds=; b=TxeDF8PHSGLPCeslT7KmwkQJ2tYrre/rSBJhNeXCsyr3aVNDLJLed12h61erlUF9GU H7atrWxc0dJ+psmfsJ9nejz4TCFYpJnrAcPDarPhvtTLVhAaO4+VdUmTOmYuR346j7nJ F82DmNSEWmqZHOr5i2eIXn3zrK+/ck6uf7erDF3xcgue4JPtG6YCiZEr4O/OdAzf0zML YI1s0mokSp/2nMa7DJkoocwbGLFOLW6IK/5iJUxICFBJhLBYw1veOG1gzC8M5BU6pgBF Q3TaIXcS2crEUYNzf/fpzMfvtQ+QaLjLTh0fpJ5F7TtasScYUmwAmWk1f+QDA5dy+xJM OVAA== Received: by 10.68.129.227 with SMTP id nz3mr31516022pbb.111.1353318676845; Mon, 19 Nov 2012 01:51:16 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id l4sm3180099paw.15.2012.11.19.01.51.12 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 19 Nov 2012 01:51:16 -0800 (PST) From: Sachin Kamat To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/4] drm/crtc: Fix potential NULL pointer dereference Date: Mon, 19 Nov 2012 15:14:57 +0530 Message-Id: <1353318299-3662-2-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1353318299-3662-1-git-send-email-sachin.kamat@linaro.org> References: <1353318299-3662-1-git-send-email-sachin.kamat@linaro.org> X-Gm-Message-State: ALoCoQlqtex16hGAb6zXtGXNOyAoT3U/DpOk1XTI95tbY+RFognq3wNMGNp3RnL+ZfXf84Z5wZMY X-Mailman-Approved-At: Mon, 19 Nov 2012 07:53:21 -0800 Cc: sachin.kamat@linaro.org, patches@linaro.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org drm_property_create_blob() could return NULL in which case NULL pointer dereference error (on connector->edid_blob_ptr) is possible. Return if connector->edid_blob_ptr is NULL. Fixes the following smatch error: drivers/gpu/drm/drm_crtc.c:3186 drm_mode_connector_update_edid_property() error: potential null dereference 'connector->edid_blob_ptr'. (drm_property_create_blob returns null) Signed-off-by: Sachin Kamat --- drivers/gpu/drm/drm_crtc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 807336a..9337ce3 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -3186,6 +3186,8 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector, size = EDID_LENGTH * (1 + edid->extensions); connector->edid_blob_ptr = drm_property_create_blob(connector->dev, size, edid); + if (!connector->edid_blob_ptr) + return -EINVAL; ret = drm_connector_property_set_value(connector, dev->mode_config.edid_property,