Received-SPF: pass (google.com: domain of linux-kernel+bounces-60815-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Daniil Dulov <d.dulov@aladdin.ru>
To: Mauro Carvalho Chehab <mchehab@kernel.org>
CC: Daniil Dulov <d.dulov@aladdin.ru>, Hans Verkuil <hverkuil@xs4all.nl>,
	Takahiro Adachi <tadachi@tadachi-net.com>, Takeru Komoriya
	<komoriya@paken.org>, <linux-media@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>, <lvc-project@linuxtesting.org>
Subject: [PATCH 17/17] media: upd64031a: Check return value of i2c_master_recv()
Date: Sun, 11 Feb 2024 07:07:48 -0800
Message-ID: <20240211150749.3832-1-d.dulov@aladdin.ru>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain

i2c_master_recv() may return an error, so add a check
and return 0xff in case it is passed.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: add953cecba8 ("V4L/DVB (3665): Add new NEC uPD64031A and uPD64083 i2c drivers")
Signed-off-by: Daniil Dulov <d.dulov@aladdin.ru>
---
 drivers/media/i2c/upd64031a.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/media/i2c/upd64031a.c b/drivers/media/i2c/upd64031a.c
index ef35c6574785..f51f86f30c73 100644
--- a/drivers/media/i2c/upd64031a.c
+++ b/drivers/media/i2c/upd64031a.c
@@ -73,11 +73,12 @@ static u8 upd64031a_read(struct v4l2_subdev *sd, u8 reg)
 {
 	struct i2c_client *client = v4l2_get_subdevdata(sd);
 	u8 buf[2];
+	int rc;
 
 	if (reg >= sizeof(buf))
 		return 0xff;
-	i2c_master_recv(client, buf, 2);
-	return buf[reg];
+	rc = i2c_master_recv(client, buf, 2);
+	return rc < 0 ? 0xff : buf[reg];
 }
 
 /* ------------------------------------------------------------------------ */
-- 
2.25.1