diff mbox

[-next,media] mt9v022: fix potential NULL pointer dereference in mt9v022_probe()

Message ID CAPgLHd_6U7mMeU5r6Axc9WmpUhO1+fv5vnWXVau19zTC_qdz=g@mail.gmail.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Wei Yongjun Nov. 29, 2012, 2:56 a.m. UTC 
  From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

The dereference to 'icl' should be moved below the NULL test.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
 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

Comments

Anatolij Gustschin Nov. 29, 2012, 8:24 a.m. UTC | #1 
On Wed, 28 Nov 2012 21:56:15 -0500
Wei Yongjun <weiyj.lk@gmail.com> wrote:

> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> The dereference to 'icl' should be moved below the NULL test.
> 
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Acked-by: Anatolij Gustschin <agust@denx.de>

> ---
>  drivers/media/i2c/soc_camera/mt9v022.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> 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,
--
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 mbox

Patch

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,