]> git.hungrycats.org Git - linux/commitdiff
media: adv7604: prevent underflow condition when reporting colorspace
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Tue, 15 Oct 2024 10:25:09 +0000 (12:25 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 14 Nov 2024 12:15:13 +0000 (13:15 +0100)
[ Upstream commit 50b9fa751d1aef5d262bde871c70a7f44262f0bc ]

Currently, adv76xx_log_status() reads some date using
io_read() which may return negative values. The current logic
doesn't check such errors, causing colorspace to be reported
on a wrong way at adv76xx_log_status(), as reported by Coverity.

If I/O error happens there, print a different message, instead
of reporting bogus messages to userspace.

Fixes: 54450f591c99 ("[media] adv7604: driver for the Analog Devices ADV7604 video decoder")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/i2c/adv7604.c

index bda0c547ce44525decb5868166bd01097276537d..96c2fa2c3b7a55d8bdf83fbd7fb7a2b9a42c8636 100644 (file)
@@ -2516,10 +2516,10 @@ static int adv76xx_log_status(struct v4l2_subdev *sd)
        const struct adv76xx_chip_info *info = state->info;
        struct v4l2_dv_timings timings;
        struct stdi_readback stdi;
-       u8 reg_io_0x02 = io_read(sd, 0x02);
+       int ret;
+       u8 reg_io_0x02;
        u8 edid_enabled;
        u8 cable_det;
-
        static const char * const csc_coeff_sel_rb[16] = {
                "bypassed", "YPbPr601 -> RGB", "reserved", "YPbPr709 -> RGB",
                "reserved", "RGB -> YPbPr601", "reserved", "RGB -> YPbPr709",
@@ -2618,13 +2618,21 @@ static int adv76xx_log_status(struct v4l2_subdev *sd)
        v4l2_info(sd, "-----Color space-----\n");
        v4l2_info(sd, "RGB quantization range ctrl: %s\n",
                        rgb_quantization_range_txt[state->rgb_quantization_range]);
-       v4l2_info(sd, "Input color space: %s\n",
-                       input_color_space_txt[reg_io_0x02 >> 4]);
-       v4l2_info(sd, "Output color space: %s %s, alt-gamma %s\n",
-                       (reg_io_0x02 & 0x02) ? "RGB" : "YCbCr",
-                       (((reg_io_0x02 >> 2) & 0x01) ^ (reg_io_0x02 & 0x01)) ?
-                               "(16-235)" : "(0-255)",
-                       (reg_io_0x02 & 0x08) ? "enabled" : "disabled");
+
+       ret = io_read(sd, 0x02);
+       if (ret < 0) {
+               v4l2_info(sd, "Can't read Input/Output color space\n");
+       } else {
+               reg_io_0x02 = ret;
+
+               v4l2_info(sd, "Input color space: %s\n",
+                               input_color_space_txt[reg_io_0x02 >> 4]);
+               v4l2_info(sd, "Output color space: %s %s, alt-gamma %s\n",
+                               (reg_io_0x02 & 0x02) ? "RGB" : "YCbCr",
+                               (((reg_io_0x02 >> 2) & 0x01) ^ (reg_io_0x02 & 0x01)) ?
+                                       "(16-235)" : "(0-255)",
+                               (reg_io_0x02 & 0x08) ? "enabled" : "disabled");
+       }
        v4l2_info(sd, "Color space conversion: %s\n",
                        csc_coeff_sel_rb[cp_read(sd, info->cp_csc) >> 4]);