3.18-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Nathan Chancellor <natechancel...@gmail.com>

Kernels that do not have f6b10209b90d ("virtio-net: switch to use
build_skb() for small buffer") will have an extra call to skb_to_sgvec
that is not handled by e2fcad58fd23 ("virtio_net: check return value of
skb_to_sgvec always"). Since the former does not appear to be stable
material, just fix the call up directly.

Cc: Jason A. Donenfeld <ja...@zx2c4.com>
Cc: Sergei Shtylyov <sergei.shtyl...@cogentembedded.com>
Cc: "Michael S. Tsirkin" <m...@redhat.com>
Cc: Jason Wang <jasow...@redhat.com>
Cc: David S. Miller <da...@davemloft.net>
Signed-off-by: Nathan Chancellor <natechancel...@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/net/virtio_net.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -551,7 +551,12 @@ static int add_recvbuf_small(struct rece
        hdr = skb_vnet_hdr(skb);
        sg_init_table(rq->sg, MAX_SKB_FRAGS + 2);
        sg_set_buf(rq->sg, &hdr->hdr, sizeof hdr->hdr);
-       skb_to_sgvec(skb, rq->sg + 1, 0, skb->len);
+
+       err = skb_to_sgvec(skb, rq->sg + 1, 0, skb->len);
+       if (unlikely(err < 0)) {
+               dev_kfree_skb(skb);
+               return err;
+       }
 
        err = virtqueue_add_inbuf(rq->vq, rq->sg, 2, skb, gfp);
        if (err < 0)


Reply via email to