lkml.org 
[lkml]   [2021]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 176/207] maple: fix wrong return value of maple_bus_init().
    Date
    From: Lu Wei <luwei32@huawei.com>

    [ Upstream commit bde82ee391fa6d3ad054313c4aa7b726d32515ce ]

    If KMEM_CACHE or maple_alloc_dev failed, the maple_bus_init() will return 0
    rather than error, because the retval is not changed after KMEM_CACHE or
    maple_alloc_dev failed.

    Fixes: 17be2d2b1c33 ("sh: Add maple bus support for the SEGA Dreamcast.")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Lu Wei <luwei32@huawei.com>
    Acked-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
    Signed-off-by: Rich Felker <dalias@libc.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/sh/maple/maple.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
    index bec81c2404f78..1682fa3671bc3 100644
    --- a/drivers/sh/maple/maple.c
    +++ b/drivers/sh/maple/maple.c
    @@ -835,8 +835,10 @@ static int __init maple_bus_init(void)

    maple_queue_cache = KMEM_CACHE(maple_buffer, SLAB_HWCACHE_ALIGN);

    - if (!maple_queue_cache)
    + if (!maple_queue_cache) {
    + retval = -ENOMEM;
    goto cleanup_bothirqs;
    + }

    INIT_LIST_HEAD(&maple_waitq);
    INIT_LIST_HEAD(&maple_sentq);
    @@ -849,6 +851,7 @@ static int __init maple_bus_init(void)
    if (!mdev[i]) {
    while (i-- > 0)
    maple_free_dev(mdev[i]);
    + retval = -ENOMEM;
    goto cleanup_cache;
    }
    baseunits[i] = mdev[i];
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-24 13:28    [W:4.084 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site