Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31e562e5 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Greg Kroah-Hartman
Browse files

media: adv7604: prevent underflow condition when reporting colorspace 



[ 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: 54450f59 ("[media] adv7604: driver for the Analog Devices ADV7604 video decoder")
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Reviewed-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5b389fe1

drivers/media/i2c/adv7604.c

+17 −9
Original line number Diff line number Diff line
@@ -2477,10 +2477,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",
@@ -2579,6 +2579,13 @@ 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]);



	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",
@@ -2586,6 +2593,7 @@ static int adv76xx_log_status(struct v4l2_subdev *sd) 
				(((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]);