lkml.org 
[lkml]   [2018]   [Sep]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 072/158] Drivers: hv: vmbus: Cleanup synic memory free path
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Michael Kelley <mikelley@microsoft.com>

    [ Upstream commit 572086325ce9a9e348b8748e830653f3959e88b6 ]

    clk_evt memory is not being freed when the synic is shutdown
    or when there is an allocation error. Add the appropriate
    kfree() call, along with a comment to clarify how the memory
    gets freed after an allocation error. Make the free path
    consistent by removing checks for NULL since kfree() and
    free_page() already do the check.

    Signed-off-by: Michael Kelley <mikelley@microsoft.com>
    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/hv/hv.c | 14 ++++++++------
    1 file changed, 8 insertions(+), 6 deletions(-)

    --- a/drivers/hv/hv.c
    +++ b/drivers/hv/hv.c
    @@ -242,6 +242,10 @@ int hv_synic_alloc(void)

    return 0;
    err:
    + /*
    + * Any memory allocations that succeeded will be freed when
    + * the caller cleans up by calling hv_synic_free()
    + */
    return -ENOMEM;
    }

    @@ -254,12 +258,10 @@ void hv_synic_free(void)
    struct hv_per_cpu_context *hv_cpu
    = per_cpu_ptr(hv_context.cpu_context, cpu);

    - if (hv_cpu->synic_event_page)
    - free_page((unsigned long)hv_cpu->synic_event_page);
    - if (hv_cpu->synic_message_page)
    - free_page((unsigned long)hv_cpu->synic_message_page);
    - if (hv_cpu->post_msg_page)
    - free_page((unsigned long)hv_cpu->post_msg_page);
    + kfree(hv_cpu->clk_evt);
    + free_page((unsigned long)hv_cpu->synic_event_page);
    + free_page((unsigned long)hv_cpu->synic_message_page);
    + free_page((unsigned long)hv_cpu->post_msg_page);
    }

    kfree(hv_context.hv_numa_map);

    \
     
     \ /
      Last update: 2018-09-18 01:18    [W:4.068 / U:0.392 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site