lkml.org 
[lkml]   [2019]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 154/321] drivers/regulator: fix a missing check of return value
    Date
    From: Kangjie Lu <kjlu@umn.edu>

    [ Upstream commit 966e927bf8cc6a44f8b72582a1d6d3ffc73b12ad ]

    If palmas_smps_read() fails, we should not use the read data in "reg"
    which may contain random value. The fix inserts a check for the return
    value of palmas_smps_read(): If it fails, we return the error code
    upstream and stop using "reg".

    Signed-off-by: Kangjie Lu <kjlu@umn.edu>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/regulator/palmas-regulator.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
    index bb5ab7d78895b..c2cc392a27d40 100644
    --- a/drivers/regulator/palmas-regulator.c
    +++ b/drivers/regulator/palmas-regulator.c
    @@ -443,13 +443,16 @@ static int palmas_ldo_write(struct palmas *palmas, unsigned int reg,
    static int palmas_set_mode_smps(struct regulator_dev *dev, unsigned int mode)
    {
    int id = rdev_get_id(dev);
    + int ret;
    struct palmas_pmic *pmic = rdev_get_drvdata(dev);
    struct palmas_pmic_driver_data *ddata = pmic->palmas->pmic_ddata;
    struct palmas_regs_info *rinfo = &ddata->palmas_regs_info[id];
    unsigned int reg;
    bool rail_enable = true;

    - palmas_smps_read(pmic->palmas, rinfo->ctrl_addr, &reg);
    + ret = palmas_smps_read(pmic->palmas, rinfo->ctrl_addr, &reg);
    + if (ret)
    + return ret;

    reg &= ~PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;

    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-03 23:52    [W:2.305 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site