lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 817/862] usb: host: xhci: Fix potential memory leak in xhci_alloc_stream_info()
    Date
    From: Jianglei Nie <niejianglei2021@163.com>

    [ Upstream commit 7e271f42a5cc3768cd2622b929ba66859ae21f97 ]

    xhci_alloc_stream_info() allocates stream context array for stream_info
    ->stream_ctx_array with xhci_alloc_stream_ctx(). When some error occurs,
    stream_info->stream_ctx_array is not released, which will lead to a
    memory leak.

    We can fix it by releasing the stream_info->stream_ctx_array with
    xhci_free_stream_ctx() on the error path to avoid the potential memory
    leak.

    Signed-off-by: Jianglei Nie <niejianglei2021@163.com>
    Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
    Link: https://lore.kernel.org/r/20220921123450.671459-2-mathias.nyman@linux.intel.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/host/xhci-mem.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
    index 8c19e151a945..9e56aa28efcd 100644
    --- a/drivers/usb/host/xhci-mem.c
    +++ b/drivers/usb/host/xhci-mem.c
    @@ -641,7 +641,7 @@ struct xhci_stream_info *xhci_alloc_stream_info(struct xhci_hcd *xhci,
    num_stream_ctxs, &stream_info->ctx_array_dma,
    mem_flags);
    if (!stream_info->stream_ctx_array)
    - goto cleanup_ctx;
    + goto cleanup_ring_array;
    memset(stream_info->stream_ctx_array, 0,
    sizeof(struct xhci_stream_ctx)*num_stream_ctxs);

    @@ -702,6 +702,11 @@ struct xhci_stream_info *xhci_alloc_stream_info(struct xhci_hcd *xhci,
    }
    xhci_free_command(xhci, stream_info->free_streams_command);
    cleanup_ctx:
    + xhci_free_stream_ctx(xhci,
    + stream_info->num_stream_ctxs,
    + stream_info->stream_ctx_array,
    + stream_info->ctx_array_dma);
    +cleanup_ring_array:
    kfree(stream_info->stream_rings);
    cleanup_info:
    kfree(stream_info);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 12:48    [W:3.030 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site