* [PATCH] media: atomisp: fix the uninitialized use
@ 2021-06-15 18:45 Yizhuo Zhai
2021-06-18 10:37 ` Hans Verkuil
0 siblings, 1 reply; 2+ messages in thread
From: Yizhuo Zhai @ 2021-06-15 18:45 UTC (permalink / raw)
To: Mauro Carvalho Chehab, akari.ailus, Greg Kroah-Hartman,
juant.aldea, linux-media, linux-staging, linux-kernel
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.
Signed-off-by: Yizhuo <yzhai003@ucr.edu>
---
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
index f5de81132177..8ddddb18ffbb 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
@@ -1534,12 +1534,15 @@ static int mt9m114_detect(struct
mt9m114_device *dev, struct i2c_client *client)
{
struct i2c_adapter *adapter = client->adapter;
u32 retvalue;
+ 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);
+ ret = mt9m114_read_reg(client, MISENSOR_16BIT,
(u32)MT9M114_PID, &retvalue);
+ if (ret)
+ return ret;
dev->real_model_id = retvalue;
if (retvalue != MT9M114_MOD_ID) {
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] media: atomisp: fix the uninitialized use
2021-06-15 18:45 [PATCH] media: atomisp: fix the uninitialized use Yizhuo Zhai
@ 2021-06-18 10:37 ` Hans Verkuil
0 siblings, 0 replies; 2+ messages in thread
From: Hans Verkuil @ 2021-06-18 10:37 UTC (permalink / raw)
To: Yizhuo Zhai, Mauro Carvalho Chehab, akari.ailus,
Greg Kroah-Hartman, juant.aldea, linux-media, linux-staging,
linux-kernel
On 15/06/2021 20:45, Yizhuo Zhai wrote:
> 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.
>
> Signed-off-by: Yizhuo <yzhai003@ucr.edu>
> ---
> drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
> b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
> index f5de81132177..8ddddb18ffbb 100644
> --- a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
> +++ b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
> @@ -1534,12 +1534,15 @@ static int mt9m114_detect(struct
> mt9m114_device *dev, struct i2c_client *client)
> {
> struct i2c_adapter *adapter = client->adapter;
> u32 retvalue;
> + int ret;
Hmm, 'ret' and 'retvalue'. That's a bit confusing. Just rename 'retvalue'
to 'model', then it makes more sense.
>
> 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);
> + ret = mt9m114_read_reg(client, MISENSOR_16BIT,
> (u32)MT9M114_PID, &retvalue);
> + if (ret)
> + return ret;
> dev->real_model_id = retvalue;
>
> if (retvalue != MT9M114_MOD_ID) {
>
This patch got mangled by your mail client: long lines were wrapped around.
Regards,
Hans
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-18 10:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-15 18:45 [PATCH] media: atomisp: fix the uninitialized use Yizhuo Zhai
2021-06-18 10:37 ` Hans Verkuil
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).