xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: atomisp: fix the uninitialized use and rename "retvalue"

Browse Source 
[ Upstream commit c275e5d349b0d2b1143607d28b9c7c14a8a0a9b4 ]

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.

Link: https://lore.kernel.org/linux-media/20210625053858.3862-1-yzhai003@ucr.edu
Fixes: ad85094 (media / atomisp: fix the uninitialized use of model ID)
Signed-off-by: Yizhuo <yzhai003@ucr.edu>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yizhuo
2021-06-25 07:38:56 +02:00
committed by Greg Kroah-Hartman
parent b0e87701b8
commit e9a6274087
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
View File

@@ -1533,16 +1533,19 @@ static struct v4l2_ctrl_config mt9m114_controls[] = {
static int mt9m114_detect(struct mt9m114_device *dev, struct i2c_client *client) static int mt9m114_detect(struct mt9m114_device *dev, struct i2c_client *client)
{ {
struct i2c_adapter *adapter = client->adapter; struct i2c_adapter *adapter = client->adapter;
u32 retvalue; u32 model;
int ret;
if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
dev_err(&client->dev, "%s: i2c error", __func__); dev_err(&client->dev, "%s: i2c error", __func__);
return -ENODEV; return -ENODEV;
} }
mt9m114_read_reg(client, MISENSOR_16BIT, (u32)MT9M114_PID, &retvalue); ret = mt9m114_read_reg(client, MISENSOR_16BIT, MT9M114_PID, &model);
dev->real_model_id = retvalue; 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", dev_err(&client->dev, "%s: failed: client->addr = %x\n",
__func__, client->addr); __func__, client->addr);
return -ENODEV; return -ENODEV;