Skip to content

Commit

Permalink
media: si2165: fix a missing check of return value
Browse files Browse the repository at this point in the history
[ Upstream commit 0ab34a0 ]

si2165_readreg8() may fail. Looking into si2165_readreg8(), we will find
that "val_tmp" will be an uninitialized value when regmap_read() fails.
"val_tmp" is then assigned to "val". So if si2165_readreg8() fails,
"val" will be a random value. Further use will lead to undefined
behaviors. The fix checks if si2165_readreg8() fails, and if so, returns
its error code upstream.

Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Reviewed-by: Matthias Schwarzott <zzam@gentoo.org>
Tested-by: Matthias Schwarzott <zzam@gentoo.org>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
kengiter authored and gregkh committed May 31, 2019
1 parent 561bd56 commit ab934f0
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/media/dvb-frontends/si2165.c
Original file line number Diff line number Diff line change
Expand Up @@ -275,18 +275,20 @@ static u32 si2165_get_fe_clk(struct si2165_state *state)

static int si2165_wait_init_done(struct si2165_state *state)
{
int ret = -EINVAL;
int ret;
u8 val = 0;
int i;

for (i = 0; i < 3; ++i) {
si2165_readreg8(state, REG_INIT_DONE, &val);
ret = si2165_readreg8(state, REG_INIT_DONE, &val);
if (ret < 0)
return ret;
if (val == 0x01)
return 0;
usleep_range(1000, 50000);
}
dev_err(&state->client->dev, "init_done was not set\n");
return ret;
return -EINVAL;
}

static int si2165_upload_firmware_block(struct si2165_state *state,
Expand Down

0 comments on commit ab934f0

Please sign in to comment.