From patchwork Mon Nov 19 09:44:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 1765651 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 D48B6DF264 for ; Mon, 19 Nov 2012 15:58:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D6043E61A2 for ; Mon, 19 Nov 2012 07:58:39 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-da0-f49.google.com (mail-da0-f49.google.com [209.85.210.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 39F1CE607A for ; Mon, 19 Nov 2012 01:51:23 -0800 (PST) Received: by mail-da0-f49.google.com with SMTP id v40so1048463dad.36 for ; Mon, 19 Nov 2012 01:51:23 -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=Ha6PPyuuX/S9FG1ZboHPmmS64DTVorR9mVnWAKkC1oU=; b=ZW0xJ7JO8+apYiwdSJbxp7gzJsq2cKcs7k22cLC02lwulFbSkJ5kjszr5HCZyMDreP QypTvyUeDxk4932hM2Y1/7FsG7AiNXBhsl+nVSMcBGKKvBBGZfJuTbynOZvAEqT62Peu x0LBgMU13Oxj/+0JlTrfpG9Bvg8SKKMm6pd1FXxP8qfM9iu4ADgOfRVddgs/GOTGBdJF Izys7a0t9Im+T22elciGulX97w8il1bXLLl851lqiqchL28YVWj2Z9Hf4yv9O7yKxujn PNjey5H4XfbdVMNXYHyZDv8zm5VZmKQRD3F93bcod40zV0KNspDPtC63YJaF1vSSQOOl Ab/A== Received: by 10.66.88.102 with SMTP id bf6mr34358918pab.10.1353318683225; Mon, 19 Nov 2012 01:51:23 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id l4sm3180099paw.15.2012.11.19.01.51.17 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 19 Nov 2012 01:51:22 -0800 (PST) From: Sachin Kamat To: dri-devel@lists.freedesktop.org Subject: [PATCH 3/4] drm/fb_helper: Fix potential NULL pointer dereference Date: Mon, 19 Nov 2012 15:14:58 +0530 Message-Id: <1353318299-3662-3-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: ALoCoQnQo3KZPeV2LBykF74gpRm8XBKCqjHtd5m6qiYTYBZwnx5odmD/Gsjc+7BE3r7g0Kj8/Rf1 X-Mailman-Approved-At: Mon, 19 Nov 2012 07:53:20 -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 kcalloc returns NULL on failure. Hence check for the return value and exit on error to avoid NULL pointer dereference. Fixes the following smatch errors: drivers/gpu/drm/drm_fb_helper.c:1271 drm_setup_crtcs() error: potential null dereference 'modes'. (kcalloc returns null) drivers/gpu/drm/drm_fb_helper.c:1272 drm_setup_crtcs() error: potential null dereference 'crtcs'. (kcalloc returns null) Signed-off-by: Sachin Kamat --- Dependent on the following patch series: http://comments.gmane.org/gmane.comp.video.dri.devel/76605 --- drivers/gpu/drm/drm_fb_helper.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 8c2de02..fc67cc5 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -1251,6 +1251,11 @@ static void drm_setup_crtcs(struct drm_fb_helper *fb_helper) sizeof(struct drm_display_mode *), GFP_KERNEL); enabled = kcalloc(dev->mode_config.num_connector, sizeof(bool), GFP_KERNEL); + if (!crtcs || !modes || !enabled) { + DRM_ERROR("Memory allocation failed\n"); + goto out; + } + drm_enable_connectors(fb_helper, enabled); @@ -1289,6 +1294,7 @@ static void drm_setup_crtcs(struct drm_fb_helper *fb_helper) } } +out: kfree(crtcs); kfree(modes); kfree(enabled);