Commit 7a542bee authored by Xuan Zhuo's avatar Xuan Zhuo Committed by David S. Miller
Browse files

virtio_net: fix memory leak inside XPD_TX with mergeable 



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: 44fa2dbd ("xdp: transition into using xdp_frame for ndo_xdp_xmit")
Signed-off-by: default avatarXuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ac0dbed9

drivers/net/virtio_net.c

+4 −1
Original line number Diff line number Diff line
@@ -1057,8 +1057,11 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, 
		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);