[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20250918132753.3154059-4-kieran.bingham@ideasonboard.com>
Date: Thu, 18 Sep 2025 14:27:53 +0100
From: Kieran Bingham <kieran.bingham@...asonboard.com>
To: linux-media@...r.kernel.org
Cc: Stefan Klug <stefan.klug@...asonboard.com>,
Kieran Bingham <kieran.bingham@...asonboard.com>,
Sakari Ailus <sakari.ailus@...ux.intel.com>,
Umang Jain <umang.jain@...asonboard.com>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
linux-kernel@...r.kernel.org (open list)
Subject: [PATCH 3/3] media: i2c: imx283: Fix handling of unsupported mbus codes
From: Stefan Klug <stefan.klug@...asonboard.com>
When the code requested by imx283_set_pad_format() is not supported, a
kernel exception occurs due to dereferencing the mode variable which is
null. Fix that by correcting the code to a valid value before getting
the mode table.
While at it, remove the cases for the other unsupported codes in
get_mode_table.
Signed-off-by: Stefan Klug <stefan.klug@...asonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@...asonboard.com>
---
drivers/media/i2c/imx283.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/drivers/media/i2c/imx283.c b/drivers/media/i2c/imx283.c
index 582975ac849f..48a92bc8e6f1 100644
--- a/drivers/media/i2c/imx283.c
+++ b/drivers/media/i2c/imx283.c
@@ -576,23 +576,31 @@ static inline struct imx283 *to_imx283(struct v4l2_subdev *sd)
return container_of_const(sd, struct imx283, sd);
}
+static inline int get_format_code(unsigned int code)
+{
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(imx283_mbus_codes); i++)
+ if (imx283_mbus_codes[i] == code)
+ break;
+
+ if (i >= ARRAY_SIZE(imx283_mbus_codes))
+ i = 0;
+
+ return imx283_mbus_codes[i];
+}
+
static inline void get_mode_table(unsigned int code,
const struct imx283_mode **mode_list,
unsigned int *num_modes)
{
switch (code) {
case MEDIA_BUS_FMT_SRGGB12_1X12:
- case MEDIA_BUS_FMT_SGRBG12_1X12:
- case MEDIA_BUS_FMT_SGBRG12_1X12:
- case MEDIA_BUS_FMT_SBGGR12_1X12:
*mode_list = supported_modes_12bit;
*num_modes = ARRAY_SIZE(supported_modes_12bit);
break;
case MEDIA_BUS_FMT_SRGGB10_1X10:
- case MEDIA_BUS_FMT_SGRBG10_1X10:
- case MEDIA_BUS_FMT_SGBRG10_1X10:
- case MEDIA_BUS_FMT_SBGGR10_1X10:
*mode_list = supported_modes_10bit;
*num_modes = ARRAY_SIZE(supported_modes_10bit);
break;
@@ -973,6 +981,8 @@ static int imx283_set_pad_format(struct v4l2_subdev *sd,
const struct imx283_mode *mode_list;
unsigned int num_modes;
+ fmt->format.code = get_format_code(fmt->format.code);
+
get_mode_table(fmt->format.code, &mode_list, &num_modes);
mode = v4l2_find_nearest_size(mode_list, num_modes, width, height,
@@ -1371,8 +1381,6 @@ static int imx283_init_controls(struct imx283 *imx283)
imx283->vflip = v4l2_ctrl_new_std(ctrl_hdlr, &imx283_ctrl_ops, V4L2_CID_VFLIP,
0, 1, 1, 0);
- if (imx283->vflip)
- imx283->vflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
v4l2_ctrl_new_std_menu_items(ctrl_hdlr, &imx283_ctrl_ops,
V4L2_CID_TEST_PATTERN,
--
2.50.1
Powered by blists - more mailing lists