lkml.org 
[lkml]   [2021]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 34/58] stm class: Fix module init return on allocation failure
    Date
    From: Wang Hui <john.wanghui@huawei.com>

    commit 927633a6d20af319d986f3e42c3ef9f6d7835008 upstream.

    In stm_heartbeat_init(): return value gets reset after the first
    iteration by stm_source_register_device(), so allocation failures
    after that will, after a clean up, return success. Fix that.

    Fixes: 119291853038 ("stm class: Add heartbeat stm source device")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Wang Hui <john.wanghui@huawei.com>
    Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Link: https://lore.kernel.org/r/20210115195917.3184-2-alexander.shishkin@linux.intel.com
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/hwtracing/stm/heartbeat.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/drivers/hwtracing/stm/heartbeat.c
    +++ b/drivers/hwtracing/stm/heartbeat.c
    @@ -64,7 +64,7 @@ static void stm_heartbeat_unlink(struct

    static int stm_heartbeat_init(void)
    {
    - int i, ret = -ENOMEM;
    + int i, ret;

    if (nr_devs < 0 || nr_devs > STM_HEARTBEAT_MAX)
    return -EINVAL;
    @@ -72,8 +72,10 @@ static int stm_heartbeat_init(void)
    for (i = 0; i < nr_devs; i++) {
    stm_heartbeat[i].data.name =
    kasprintf(GFP_KERNEL, "heartbeat.%d", i);
    - if (!stm_heartbeat[i].data.name)
    + if (!stm_heartbeat[i].data.name) {
    + ret = -ENOMEM;
    goto fail_unregister;
    + }

    stm_heartbeat[i].data.nr_chans = 1;
    stm_heartbeat[i].data.link = stm_heartbeat_link;

    \
     
     \ /
      Last update: 2021-01-25 19:50    [W:3.262 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site