[Letux-kernel] [PATCH] media: omap3isp: handle NULL return of omap3isp_video_format_info() in ccdc_is_shiftable().

Sakari Ailus sakari.ailus at iki.fi
Mon Jun 26 22:12:53 CEST 2017


Hi Nikolaus,

On Mon, Jun 26, 2017 at 07:54:19PM +0200, H. Nikolaus Schaller wrote:
> If a camera module driver specifies a format that is not
> supported by omap3isp this ends in a NULL pointer
> dereference instead of a simple fail.

Has this happened in practice? If it does, it is probably a driver bug ---
the formats on its pads should be recognised by the driver.

WARN_ON() around the condition would be good to avoid silently ignoring such
issues.

I wonder what Laurent thinks.

> 
> Signed-off-by: H. Nikolaus Schaller <hns at goldelico.com>
> ---
>  drivers/media/platform/omap3isp/ispccdc.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c
> index 2fb755f20a6b..dcf16ee7c612 100644
> --- a/drivers/media/platform/omap3isp/ispccdc.c
> +++ b/drivers/media/platform/omap3isp/ispccdc.c
> @@ -2397,6 +2397,9 @@ static bool ccdc_is_shiftable(u32 in, u32 out, unsigned int additional_shift)
>  	in_info = omap3isp_video_format_info(in);
>  	out_info = omap3isp_video_format_info(out);
>  
> +	if (!in_info || !out_info)
> +		return false;
> +
>  	if ((in_info->flavor == 0) || (out_info->flavor == 0))
>  		return false;
>  

-- 
Regards,

Sakari Ailus
e-mail: sakari.ailus at iki.fi	XMPP: sailus at retiisi.org.uk


More information about the Letux-kernel mailing list