From patchwork Thu Nov 29 02:56:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 15727 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TduIb-0004pc-Uk for patchwork@linuxtv.org; Thu, 29 Nov 2012 03:56:25 +0100 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 1TduIa-0000OQ-Ii; Thu, 29 Nov 2012 03:56:25 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755556Ab2K2C4Q (ORCPT ); Wed, 28 Nov 2012 21:56:16 -0500 Received: from mail-qc0-f174.google.com ([209.85.216.174]:45388 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755525Ab2K2C4Q (ORCPT ); Wed, 28 Nov 2012 21:56:16 -0500 Received: by mail-qc0-f174.google.com with SMTP id o22so10395601qcr.19 for ; Wed, 28 Nov 2012 18:56:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=M9VkGUX+DTTg8WfdbVRNMrhZEXr/KTHLIkJgAz2BEAU=; b=KCn/3vHsX97QJMXbW53R9738q+8C+4U8g/wjeyySYk7Lf0HsqXhbIFthCHkpJgi9UQ KLfmJSgr9twlouxh3LPPq6KjFUWYCpTe+MChSjYRk5VO4Jq+AvkjpbdSGmxpkRJW+IEO /fxlHbws6XeAMoS6qZAEdKmqY530pUqodjwtqClAVrATzChji+gHAlIU90tmPlbIxfY8 UIojUmjgx9g4TZrGbmtH6PHirHQP/4f04aTgAtkAEQeySNCdDXq/wgpsTBtBfwLHjD2H 8di/HZqJLoHW9RbktdFIqkBmwCwaxRgcQWooy2JEqIUz/ocCvncme4V1XDge0kQ3bJ11 JZFA== MIME-Version: 1.0 Received: by 10.49.48.43 with SMTP id i11mr4225075qen.3.1354157775300; Wed, 28 Nov 2012 18:56:15 -0800 (PST) Received: by 10.229.126.165 with HTTP; Wed, 28 Nov 2012 18:56:15 -0800 (PST) Date: Wed, 28 Nov 2012 21:56:15 -0500 Message-ID: Subject: [PATCH -next] [media] mt9v022: fix potential NULL pointer dereference in mt9v022_probe() From: Wei Yongjun To: g.liakhovetski@gmx.de, mchehab@redhat.com, agust@denx.de Cc: yongjun_wei@trendmicro.com.cn, linux-media@vger.kernel.org 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.11.29.24515 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' CN_TLD 0.1, FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1300_1399 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, WEBMAIL_SOURCE 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_HTTP_RECEIVED 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Wei Yongjun The dereference to 'icl' should be moved below the NULL test. Signed-off-by: Wei Yongjun Acked-by: Anatolij Gustschin --- drivers/media/i2c/soc_camera/mt9v022.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/i2c/soc_camera/mt9v022.c b/drivers/media/i2c/soc_camera/mt9v022.c index d40a885..7509802 100644 --- a/drivers/media/i2c/soc_camera/mt9v022.c +++ b/drivers/media/i2c/soc_camera/mt9v022.c @@ -875,7 +875,7 @@ static int mt9v022_probe(struct i2c_client *client, struct mt9v022 *mt9v022; struct soc_camera_link *icl = soc_camera_i2c_to_link(client); struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); - struct mt9v022_platform_data *pdata = icl->priv; + struct mt9v022_platform_data *pdata; int ret; if (!icl) { @@ -893,6 +893,7 @@ static int mt9v022_probe(struct i2c_client *client, if (!mt9v022) return -ENOMEM; + pdata = icl->priv; v4l2_i2c_subdev_init(&mt9v022->subdev, client, &mt9v022_subdev_ops); v4l2_ctrl_handler_init(&mt9v022->hdl, 6); v4l2_ctrl_new_std(&mt9v022->hdl, &mt9v022_ctrl_ops,