Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1674980

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

From "H. Nikolaus Schaller" <hns@goldelico.com>
Newsgroups linux.kernel
Subject [PATCH] media: omap3isp: handle NULL return of omap3isp_video_format_info() in ccdc_is_shiftable().
Date 2017-06-26 20:00 +0200
Message-ID <tWGsN-5pf-5@gated-at.bofh.it> (permalink)
Organization linux.* mail to news gateway

Show all headers | View raw


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.

Signed-off-by: H. Nikolaus Schaller <hns@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;
 
-- 
2.12.2

Back to linux.kernel | Previous | NextNext in thread | Find similar | Unroll thread


Thread

[PATCH] media: omap3isp: handle NULL return of omap3isp_video_format_info() in ccdc_is_shiftable(). "H. Nikolaus Schaller" <hns@goldelico.com> - 2017-06-26 20:00 +0200
  Re: [PATCH] media: omap3isp: handle NULL return of  omap3isp_video_format_info() in ccdc_is_shiftable(). Sakari Ailus <sakari.ailus@iki.fi> - 2017-06-26 22:20 +0200
    Re: [PATCH] media: omap3isp: handle NULL return of omap3isp_video_format_info() in ccdc_is_shiftable(). "H. Nikolaus Schaller" <hns@goldelico.com> - 2017-06-27 07:50 +0200
      Re: [PATCH] media: omap3isp: handle NULL return of  omap3isp_video_format_info() in ccdc_is_shiftable(). Sakari Ailus <sakari.ailus@iki.fi> - 2017-06-27 08:00 +0200

csiph-web