lkml.org 
[lkml]   [2021]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 220/289] xen/unpopulated-alloc: fix error return code in fill_list()
    Date
    From: Zhen Lei <thunder.leizhen@huawei.com>

    [ Upstream commit dbc03e81586fc33e4945263fd6e09e22eb4b980f ]

    Fix to return a negative error code from the error handling case instead
    of 0, as done elsewhere in this function.

    Fixes: a4574f63edc6 ("mm/memremap_pages: convert to 'struct range'")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
    Reviewed-by: Juergen Gross <jgross@suse.com>
    Link: https://lore.kernel.org/r/20210508021913.1727-1-thunder.leizhen@huawei.com
    Signed-off-by: Juergen Gross <jgross@suse.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/xen/unpopulated-alloc.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/xen/unpopulated-alloc.c b/drivers/xen/unpopulated-alloc.c
    index e64e6befc63b..87e6b7db892f 100644
    --- a/drivers/xen/unpopulated-alloc.c
    +++ b/drivers/xen/unpopulated-alloc.c
    @@ -39,8 +39,10 @@ static int fill_list(unsigned int nr_pages)
    }

    pgmap = kzalloc(sizeof(*pgmap), GFP_KERNEL);
    - if (!pgmap)
    + if (!pgmap) {
    + ret = -ENOMEM;
    goto err_pgmap;
    + }

    pgmap->type = MEMORY_DEVICE_GENERIC;
    pgmap->range = (struct range) {
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-17 18:06    [W:4.023 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site