lkml.org 
[lkml]   [2018]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 162/190] virtio_net: check return value of skb_to_sgvec in one more location
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Nathan Chancellor <natechancellor@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 <Jason@zx2c4.com>
    Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
    Cc: "Michael S. Tsirkin" <mst@redhat.com>
    Cc: Jason Wang <jasowang@redhat.com>
    Cc: David S. Miller <davem@davemloft.net>
    Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@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
    @@ -556,7 +556,12 @@ static int add_recvbuf_small(struct virt
    hdr = skb_vnet_hdr(skb);
    sg_init_table(rq->sg, 2);
    sg_set_buf(rq->sg, hdr, vi->hdr_len);
    - 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)

    \
     
     \ /
      Last update: 2018-04-11 22:27    [W:4.788 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site