Re: [PATCH] [media] soc_camera: soc_camera_pdrv_probe: fix potential NULL pointer dereference

From: Guennadi Liakhovetski
Date: Wed Sep 16 2015 - 11:08:23 EST


On Wed, 16 Sep 2015, Wang YanQing wrote:

> Move dereference of sdesc after NULL pointer checker.
>
> Signed-off-by: Wang YanQing <udknight@xxxxxxxxx>
> ---
> drivers/media/platform/soc_camera/soc_camera.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
> index 9087fed..53b153d 100644
> --- a/drivers/media/platform/soc_camera/soc_camera.c
> +++ b/drivers/media/platform/soc_camera/soc_camera.c
> @@ -2187,13 +2187,14 @@ static int soc_camera_video_start(struct soc_camera_device *icd)
> static int soc_camera_pdrv_probe(struct platform_device *pdev)
> {
> struct soc_camera_desc *sdesc = pdev->dev.platform_data;
> - struct soc_camera_subdev_desc *ssdd = &sdesc->subdev_desc;
> + struct soc_camera_subdev_desc *ssdd;

NAK. This isn't a dereference. This is just an address calculation.

Thanks
Guennadi

> struct soc_camera_device *icd;
> int ret;
>
> if (!sdesc)
> return -EINVAL;
>
> + ssdd = &sdesc->subdev_desc;
> icd = devm_kzalloc(&pdev->dev, sizeof(*icd), GFP_KERNEL);
> if (!icd)
> return -ENOMEM;
> --
> 1.8.5.6.2.g3d8a54e.dirty
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/