lkml.org 
[lkml]   [2019]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 07/88] ASoC: Variable "val" in function rt274_i2c_probe() could be uninitialized
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 8c3590de0a378c2449fc1aec127cc693632458e4 ]

    Inside function rt274_i2c_probe(), if regmap_read() function
    returns -EINVAL, then local variable "val" leaves uninitialized
    but used in if statement. This is potentially unsafe.

    Signed-off-by: Yizhuo <yzhai003@ucr.edu>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/rt274.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/sound/soc/codecs/rt274.c b/sound/soc/codecs/rt274.c
    index 0ef966d56bac3..e2855ab9a2c6b 100644
    --- a/sound/soc/codecs/rt274.c
    +++ b/sound/soc/codecs/rt274.c
    @@ -1128,8 +1128,11 @@ static int rt274_i2c_probe(struct i2c_client *i2c,
    return ret;
    }

    - regmap_read(rt274->regmap,
    + ret = regmap_read(rt274->regmap,
    RT274_GET_PARAM(AC_NODE_ROOT, AC_PAR_VENDOR_ID), &val);
    + if (ret)
    + return ret;
    +
    if (val != RT274_VENDOR_ID) {
    dev_err(&i2c->dev,
    "Device with ID register %#x is not rt274\n", val);
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-03-04 09:41    [W:4.119 / U:1.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site