Commit fa11d992 authored by Jason Wang's avatar Jason Wang Committed by Greg Kroah-Hartman
Browse files

virtio-net: fix leaking page for gso packet during mergeable XDP 



[ Upstream commit 3d62b2a0 ]

We need to drop refcnt to xdp_page if we see a gso packet. Otherwise
it will be leaked. Fixing this by moving the check of gso packet above
the linearizing logic. While at it, remove useless comment as well.

Cc: John Fastabend <john.fastabend@gmail.com>
Fixes: 72979a6c ("virtio_net: xdp, add slowpath case for non contiguous buffers")
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2b8b2b26

drivers/net/virtio_net.c

+7 −8
Original line number Diff line number Diff line
@@ -632,6 +632,13 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, 
		void *data;

		u32 act;



		/* Transient failure which in theory could occur if

		 * in-flight packets from before XDP was enabled reach

		 * the receive path after XDP is loaded.

		 */

		if (unlikely(hdr->hdr.gso_type))

			goto err_xdp;



		/* This happens when rx buffer size is underestimated */

		if (unlikely(num_buf > 1 ||

			     headroom < virtnet_get_headroom(vi))) {
@@ -647,14 +654,6 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, 
			xdp_page = page;

		}



		/* Transient failure which in theory could occur if

		 * in-flight packets from before XDP was enabled reach

		 * the receive path after XDP is loaded. In practice I

		 * was not able to create this condition.

		 */

		if (unlikely(hdr->hdr.gso_type))

			goto err_xdp;



		/* Allow consuming headroom but reserve enough space to push

		 * the descriptor on if we get an XDP_TX return code.

		 */