From patchwork Sat Oct 13 11:41:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 15016 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TN0AB-0006Nl-2g for patchwork@linuxtv.org; Sat, 13 Oct 2012 13:45:51 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp for id 1TN0AA-0006Oa-Hn; Sat, 13 Oct 2012 13:45:50 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753003Ab2JMLps (ORCPT ); Sat, 13 Oct 2012 07:45:48 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:53925 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752962Ab2JMLpr (ORCPT ); Sat, 13 Oct 2012 07:45:47 -0400 Received: by mail-pb0-f46.google.com with SMTP id rr4so3654663pbb.19 for ; Sat, 13 Oct 2012 04:45:47 -0700 (PDT) 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:x-gm-message-state; bh=zQPzNQ5C1iOb1tEq/LB/oKNfDZ1hfcnVX817qdVP98A=; b=YXSeuiq9lsF16i94LOzaqZPjJkdB+/5R+yl+rq9XosoMPekIovsQQ4fPu2vzkZ9Ik0 Sxl7I/2NQX4RqKxgw/DF3XEIAcg48UNY4jn2VzxKnCvSqrkyNMFbSawnxVQVfqGFl+RS sKv8Jo0TTS/lHmGNv+bOWqtYtt4DfI6VMAIxyVOhZhAbgXj3mJTmf4iOTU3bokNhItt6 a5oDO4IF9iIIu6HOOtp4fFGvteVlXbJxg0ZwuMf1fQvHxX/9er1lUH8sUZi9Ga4vXpO1 P4AuttRBTUh+QLdCypKiQOFVmdxizxjEooAzxC8eZ3kVKov3pU+h5uPQI/de1GTzPs4f 4j0Q== Received: by 10.66.78.231 with SMTP id e7mr18427333pax.44.1350128747567; Sat, 13 Oct 2012 04:45:47 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id rw5sm5940446pbc.54.2012.10.13.04.45.44 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 13 Oct 2012 04:45:46 -0700 (PDT) From: Sachin Kamat To: linux-media@vger.kernel.org Cc: s.nawrocki@samsung.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 1/1] [media] s5p-fimc: Fix potential NULL pointer dereference Date: Sat, 13 Oct 2012 17:11:19 +0530 Message-Id: <1350128479-9619-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-Gm-Message-State: ALoCoQk0TRTLVMUakzvbRQ4cO/BPW3kS2kwoX1dqbaA/etZuYyqwhssFUObD2ORxoD3lqGhCQM60 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.10.13.113333 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1900_1999 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' 'fimc' was being dereferenced before the NULL check. Moved it to after the check. Signed-off-by: Sachin Kamat --- drivers/media/platform/s5p-fimc/fimc-mdevice.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/s5p-fimc/fimc-mdevice.c b/drivers/media/platform/s5p-fimc/fimc-mdevice.c index 80ada58..61fab00 100644 --- a/drivers/media/platform/s5p-fimc/fimc-mdevice.c +++ b/drivers/media/platform/s5p-fimc/fimc-mdevice.c @@ -343,7 +343,7 @@ static int fimc_md_register_sensor_entities(struct fimc_md *fmd) static int fimc_register_callback(struct device *dev, void *p) { struct fimc_dev *fimc = dev_get_drvdata(dev); - struct v4l2_subdev *sd = &fimc->vid_cap.subdev; + struct v4l2_subdev *sd; struct fimc_md *fmd = p; int ret = 0; @@ -353,6 +353,7 @@ static int fimc_register_callback(struct device *dev, void *p) if (fimc->pdev->id < 0 || fimc->pdev->id >= FIMC_MAX_DEVS) return 0; + sd = &fimc->vid_cap.subdev; fimc->pipeline_ops = &fimc_pipeline_ops; fmd->fimc[fimc->pdev->id] = fimc; sd->grp_id = FIMC_GROUP_ID; @@ -369,7 +370,7 @@ static int fimc_register_callback(struct device *dev, void *p) static int fimc_lite_register_callback(struct device *dev, void *p) { struct fimc_lite *fimc = dev_get_drvdata(dev); - struct v4l2_subdev *sd = &fimc->subdev; + struct v4l2_subdev *sd; struct fimc_md *fmd = p; int ret; @@ -379,6 +380,7 @@ static int fimc_lite_register_callback(struct device *dev, void *p) if (fimc->index >= FIMC_LITE_MAX_DEVS) return 0; + sd = &fimc->subdev; fimc->pipeline_ops = &fimc_pipeline_ops; fmd->fimc_lite[fimc->index] = fimc; sd->grp_id = FLITE_GROUP_ID;