lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 155/757] regmap: debugfs: Fix more error path regressions
    Date
    From: Charles Keepax <ckeepax@opensource.cirrus.com>

    [ Upstream commit 1d512ee861b80da63cbc501b973c53131aa22f29 ]

    Many error paths in __regmap_init rely on ret being pre-initialised to
    -EINVAL, add an extra initialisation in after the new call to
    regmap_set_name.

    Fixes: 94cc89eb8fa5 ("regmap: debugfs: Fix handling of name string for debugfs init delays")
    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
    Link: https://lore.kernel.org/r/20200918152212.22200-1-ckeepax@opensource.cirrus.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/base/regmap/regmap.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
    index b71f9ecddff5d..fff0547c26c53 100644
    --- a/drivers/base/regmap/regmap.c
    +++ b/drivers/base/regmap/regmap.c
    @@ -711,6 +711,8 @@ struct regmap *__regmap_init(struct device *dev,
    if (ret)
    goto err_map;

    + ret = -EINVAL; /* Later error paths rely on this */
    +
    if (config->disable_locking) {
    map->lock = map->unlock = regmap_lock_unlock_none;
    regmap_debugfs_disable(map);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 16:29    [W:2.306 / U:0.416 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site