virtio-net: correctly check num_buf during err path
authorJason Wang <jasowang@redhat.com>
Tue, 22 May 2018 03:44:30 +0000 (11:44 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 23 May 2018 17:36:19 +0000 (13:36 -0400)
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: 4941d472bf95 ("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>
drivers/net/virtio_net.c

index 6260d65..326e247 100644 (file)
@@ -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",