* [PATCH -next] [media] mt9v022: fix potential NULL pointer dereference in mt9v022_probe()
@ 2012-11-29 2:56 Wei Yongjun
2012-11-29 8:24 ` Anatolij Gustschin
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2012-11-29 2:56 UTC (permalink / raw)
To: g.liakhovetski, mchehab, agust; +Cc: yongjun_wei, linux-media
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(-)
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,
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -next] [media] mt9v022: fix potential NULL pointer dereference in mt9v022_probe()
2012-11-29 2:56 [PATCH -next] [media] mt9v022: fix potential NULL pointer dereference in mt9v022_probe() Wei Yongjun
@ 2012-11-29 8:24 ` Anatolij Gustschin
0 siblings, 0 replies; 2+ messages in thread
From: Anatolij Gustschin @ 2012-11-29 8:24 UTC (permalink / raw)
To: Wei Yongjun; +Cc: g.liakhovetski, mchehab, yongjun_wei, linux-media
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,
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-29 8:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-29 2:56 [PATCH -next] [media] mt9v022: fix potential NULL pointer dereference in mt9v022_probe() Wei Yongjun
2012-11-29 8:24 ` Anatolij Gustschin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox