linux-kernel - [PATCH] media: omap3isp: check the return of __ccp2_get

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <tencent_E6A97F6B1009E6F65C230E070A9770612507@qq.com>
Date:   Fri,  4 Mar 2022 19:48:18 +0800
From:   xkernel.wang@...mail.com
To:     laurent.pinchart@...asonboard.com, sakari.ailus@....fi,
        mchehab@...nel.org
Cc:     linux-media@...r.kernel.org, linux-kernel@...r.kernel.org,
        Xiaoke Wang <xkernel.wang@...mail.com>
Subject: [PATCH] media: omap3isp: check the return of __ccp2_get_format()

From: Xiaoke Wang <xkernel.wang@...mail.com>

__ccp2_get_format() returns format structure or NULL on error.
So it is better to check the return value of it to prevent potential
wrong memory access.

Signed-off-by: Xiaoke Wang <xkernel.wang@...mail.com>
---
 drivers/media/platform/omap3isp/ispccp2.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/omap3isp/ispccp2.c b/drivers/media/platform/omap3isp/ispccp2.c
index acb58b6..81881b1 100644
--- a/drivers/media/platform/omap3isp/ispccp2.c
+++ b/drivers/media/platform/omap3isp/ispccp2.c
@@ -675,8 +675,10 @@ static void ccp2_try_format(struct isp_ccp2_device *ccp2,
 		 */
 		format = __ccp2_get_format(ccp2, sd_state, CCP2_PAD_SINK,
 					   which);
-		memcpy(fmt, format, sizeof(*fmt));
-		fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
+		if (format != NULL) {
+			memcpy(fmt, format, sizeof(*fmt));
+			fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
+		}
 		break;
 	}
 
@@ -709,6 +711,9 @@ static int ccp2_enum_mbus_code(struct v4l2_subdev *sd,
 
 		format = __ccp2_get_format(ccp2, sd_state, CCP2_PAD_SINK,
 					   code->which);
+		if (format == NULL)
+			return -EINVAL;
+
 		code->code = format->code;
 	}
 
@@ -792,6 +797,9 @@ static int ccp2_set_format(struct v4l2_subdev *sd,
 	if (fmt->pad == CCP2_PAD_SINK) {
 		format = __ccp2_get_format(ccp2, sd_state, CCP2_PAD_SOURCE,
 					   fmt->which);
+		if (format == NULL)
+			return -EINVAL;
+
 		*format = fmt->format;
 		ccp2_try_format(ccp2, sd_state, CCP2_PAD_SOURCE, format,
 				fmt->which);
--