lkml.org 
[lkml]   [2020]   [Sep]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] regmap: debugfs: Fix more error path regressions
    Date
    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>
    ---
    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 b24f14ea96d8a..4c2a114584236 100644
    --- a/drivers/base/regmap/regmap.c
    +++ b/drivers/base/regmap/regmap.c
    @@ -723,6 +723,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;
    map->can_sleep = config->can_sleep;
    --
    2.11.0
    \
     
     \ /
      Last update: 2020-09-18 17:33    [W:8.296 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site