Commit 850e088d authored May 22, 2018 by Jason Wang Committed by David S. Miller May 23, 2018

virtio-net: correctly check num_buf during err path

If we successfully linearize the packet, num_buf will be set to zero
which may confuse error handling path which assumes num_buf is at
least 1 and this can lead the code tries to pop the descriptor of next
buffer. Fixing this by checking num_buf against 1 before decreasing.

Fixes: 4941d472 ("virtio-net: do not reset during XDP set")
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 5d458a13

drivers/net/virtio_net.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -875,7 +875,7 @@ err_xdp:
		rcu_read_unlock();
		err_skb:
		put_page(page);
		while (--num_buf) {
		while (num_buf-- > 1) {
		buf = virtqueue_get_buf(rq->vq, &len);
		if (unlikely(!buf)) {
		pr_debug("%s: rx error: %d buffers missing\n",

Admin message