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 355/757] mfd: syscon: Dont free allocated name for regmap_config
    Date
    From: Marc Zyngier <maz@kernel.org>

    [ Upstream commit 529a1101212a785c5df92c314b0e718287150c3b ]

    The name allocated for the regmap_config structure is freed
    pretty early, right after the registration of the MMIO region.

    Unfortunately, that doesn't follow the life cycle that debugfs
    expects, as it can access the name field long after the free
    has occurred.

    Move the free on the error path, and keep it forever otherwise.

    Fixes: e15d7f2b81d2 ("mfd: syscon: Use a unique name with regmap_config")
    Signed-off-by: Marc Zyngier <maz@kernel.org>
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mfd/syscon.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c
    index df5cebb372a59..ca465794ea9c8 100644
    --- a/drivers/mfd/syscon.c
    +++ b/drivers/mfd/syscon.c
    @@ -108,7 +108,6 @@ static struct syscon *of_syscon_register(struct device_node *np, bool check_clk)
    syscon_config.max_register = resource_size(&res) - reg_io_width;

    regmap = regmap_init_mmio(NULL, base, &syscon_config);
    - kfree(syscon_config.name);
    if (IS_ERR(regmap)) {
    pr_err("regmap init failed\n");
    ret = PTR_ERR(regmap);
    @@ -145,6 +144,7 @@ static struct syscon *of_syscon_register(struct device_node *np, bool check_clk)
    regmap_exit(regmap);
    err_regmap:
    iounmap(base);
    + kfree(syscon_config.name);
    err_map:
    kfree(syscon);
    return ERR_PTR(ret);
    --
    2.25.1


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