Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: mNPBNFDsdAQDfF2yd1IHtU8f0PLKB/WpHzHvQFdedHupzOBJFXFJos6lHPyWjFUN2hsgxXlHUG
 sOUWi72BodCfUQeelMHvooINs4dv0nSz8NJXrwCsiiQjgHeq5NZ8Wqtm4Cz5AVHu79+4iVlrzf
 8W/gqGTeiFxUdTihPLxGyArzaAVtZDhMfLy8P1J/NGipDm5G0GpAehfWEYICxNNSkzLCadjs1Q
 AD1BYBIyJPSy7ddPitPHZ0bJad8DPIcKH2dX+jelUfNli/DNGA6ZVu3jdQCoC4Kc9QtPdMKxZ3
 31T1kmjWs8PRHZkZIZvnon5c
IronPort-PHdr: A9a23:5+QGbhFxVuRxer/16YT9L51Gf+pMhN3EVzX9CrIZgr5DOp6u447ld
 BSGo6k31BmZBc6FurptsKn/i+jYQ2sO4JKM4jgpUadncFs7s/gQhBEqG8WfCEf2f7bAZi0+G
 9leBhc+pynoeUdaF9zjaFLMv3a88SAdGgnlNQpyO+/5BpPeg9642uys55HfeQZFiCaybb5zK
 Bi9sBncuNQRjYZ+MKg61wHHomFPe+RYxGNoIUyckhPh7cqu/5Bt7jpdtes5+8FPTav1caI4T
 adFDDs9KGA6+NfrtRjYQgSR4HYXT3gbnQBJAwjB6xH6Q4vxvy7nvedzxCWWIcv7Rq0vVD+88
 6lkVgPniCYfNz447m7XjNBwjLlGqx6lvhBz3pLYbJ2QOPd4e6PdfMgaRXFAXsZXWCxKH52yY
 ZISBOoPPOZXsY39qEYTphe6CwSgGObjxzlPiXLq06A2z/ktHRja0AA9AtkCtGnYodXwOKoUT
 Ou7zrTHzS/bYv1Wxznz9YbGfBMmr/6OU7J9atbdxVU1Gg/ZlFictZDpMjWI3eoNqWib6O9gW
 PqthG4mqgBxoiWvxsAxgYbKhoIa0FHE/jh+zYc1JNy4SFR0Yd+4HJdMuSyXLJZ2Td84Q21yp
 ik116AGtIe9cSMXx5sp2wTRZOabc4iU/B3jTuCRLC9kiH9hZb6xiAi+/0i9xuHhWce63lhHo
 yRFn9XQuH4AywDf58aIR/Zz/Eqs2TeC2Q/P5u9LI005i6vWJZEhz7A+kJcYrEfNHjfulUnok
 KObcl8o9+uo5uj9fLnqu5CRO5Vphgz6MKkigtGzDOU8PwQUQWSW9+Sx2Kf98UD7WrlGkOM6n
 6ffvZvHP8oUvLS5DBVQ0os77ha/CCqp38oAkHkcKVJFZAqHj4/0O1HSOPz4Demwg1CrkDpzw
 vDJJLzhApHUInjblLftYK9x60BBxAc3z91T/Z1UCrYGIPL8Xk/+qsbUAQM+Mwyx2+rnCdN92
 Z0CWW+XHKOVLKffvUWL6+8vOeWAepIZtTnnJ/Q44/Pjj2c1mVoHcqmo2ZsXZmq4HvNjI0iBY
 Xvtg9cBHn0LvgYiUODnhkaPUSNPaHaoRa4z+Cw0CJ++AYfZWo+tmKCB3Du8HpBOYmBGC1aME
 WrndomdWPcDdjiSIsl/nTwATrWhVYAh2g+0tAPgyLpoMPDU+isGupLnztR14PfTlR5hvRJuC
 MHI4mCfT3xz1lEITj5+iLFtoUV8kg/Y+bVzmbpVGcEFtKABaRszKZOJl78yMNv1QA+UO4rUI
 Gs=
IronPort-HdrOrdr: A9a23:Zbb0qa0qtgGvZYwMWuniRQqjBIkkLtp133Aq2lEZdPWaSL3gqy
 nOpoVi6faaskd1ZJhNo6HjBEDEewK+yXcX2+gs1NWZLW3bUQKTRekI0WKh+V3d8kbFh4lgPM
 lbAs5D4R7LYGSST/yR3OB1KbkdKRC8nM6Vuds=
From:   Yizhuo Zhai <yzhai003@ucr.edu>
Cc:     Yizhuo <yzhai003@ucr.edu>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        Sakari Ailus <sakari.ailus@linux.intel.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Juan Antonio Aldea-Armenteros <juant.aldea@gmail.com>,
        linux-media@vger.kernel.org, linux-staging@lists.linux.dev,
        linux-kernel@vger.kernel.org
Subject: [PATCH v4] media: atomisp: fix the uninitialized use and rename "retvalue"
Date:   Tue, 10 Aug 2021 20:54:03 -0700
Message-Id: <20210811035405.17382-1-yzhai003@ucr.edu>
In-Reply-To: <20210723003607.64179-1-yzhai003@ucr.edu>
References: <20210723003607.64179-1-yzhai003@ucr.edu>
To:     unlisted-recipients:; (no To-header on input)
Precedence: bulk

From: Yizhuo <yzhai003@ucr.edu>

Inside function mt9m114_detect(), variable "retvalue" could
be uninitialized if mt9m114_read_reg() returns error, however, it
is used in the later if statement, which is potentially unsafe.

The local variable "retvalue" is renamed to "model" to avoid
confusion.

Fixes: ad85094b293e ("Revert "media: staging: atomisp: Remove driver"")
Signed-off-by: Yizhuo Zhai<yzhai003@ucr.edu>
---
 drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
index f5de81132177..77293579a134 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
@@ -1533,16 +1533,19 @@ static struct v4l2_ctrl_config mt9m114_controls[] = {
 static int mt9m114_detect(struct mt9m114_device *dev, struct i2c_client *client)
 {
 	struct i2c_adapter *adapter = client->adapter;
-	u32 retvalue;
+	u32 model;
+	int ret;
 
 	if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
 		dev_err(&client->dev, "%s: i2c error", __func__);
 		return -ENODEV;
 	}
-	mt9m114_read_reg(client, MISENSOR_16BIT, (u32)MT9M114_PID, &retvalue);
-	dev->real_model_id = retvalue;
+	ret = mt9m114_read_reg(client, MISENSOR_16BIT, MT9M114_PID, &model);
+	if (ret)
+		return ret;
+	dev->real_model_id = model;
 
-	if (retvalue != MT9M114_MOD_ID) {
+	if (model != MT9M114_MOD_ID) {
 		dev_err(&client->dev, "%s: failed: client->addr = %x\n",
 			__func__, client->addr);
 		return -ENODEV;
-- 
2.17.1