lkml.org 
[lkml]   [2022]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 079/365] virtio_net: fix memory leak inside XPD_TX with mergeable
    Date
    From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>

    commit 7a542bee27c6a57e45c33cbbdc963325fd6493af upstream.

    When we call xdp_convert_buff_to_frame() to get xdpf, if it returns
    NULL, we should check if xdp_page was allocated by xdp_linearize_page().
    If it is newly allocated, it should be freed here alone. Just like any
    other "goto err_xdp".

    Fixes: 44fa2dbd4759 ("xdp: transition into using xdp_frame for ndo_xdp_xmit")
    Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
    Acked-by: Jason Wang <jasowang@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/virtio_net.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/drivers/net/virtio_net.c
    +++ b/drivers/net/virtio_net.c
    @@ -1057,8 +1057,11 @@ static struct sk_buff *receive_mergeable
    case XDP_TX:
    stats->xdp_tx++;
    xdpf = xdp_convert_buff_to_frame(&xdp);
    - if (unlikely(!xdpf))
    + if (unlikely(!xdpf)) {
    + if (unlikely(xdp_page != page))
    + put_page(xdp_page);
    goto err_xdp;
    + }
    err = virtnet_xdp_xmit(dev, 1, &xdpf, 0);
    if (unlikely(!err)) {
    xdp_return_frame_rx_napi(xdpf);

    \
     
     \ /
      Last update: 2022-08-23 10:20    [W:4.960 / U:0.304 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site