From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:51640 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752721AbeDJMhl (ORCPT ); Tue, 10 Apr 2018 08:37:41 -0400 Subject: Patch "virtio_net: check return value of skb_to_sgvec in one more location" has been added to the 3.18-stable tree To: natechancellor@gmail.com, Jason@zx2c4.com, davem@davemloft.net, gregkh@linuxfoundation.org, jasowang@redhat.com, mst@redhat.com, sergei.shtylyov@cogentembedded.com Cc: , From: Date: Tue, 10 Apr 2018 14:34:01 +0200 In-Reply-To: <20180410012150.6573-4-natechancellor@gmail.com> Message-ID: <152336364124017@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled virtio_net: check return value of skb_to_sgvec in one more location to the 3.18-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: virtio_net-check-return-value-of-skb_to_sgvec-in-one-more-location.patch and it can be found in the queue-3.18 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From natechancellor@gmail.com Tue Apr 10 14:13:23 2018 From: Nathan Chancellor Date: Mon, 9 Apr 2018 18:21:44 -0700 Subject: virtio_net: check return value of skb_to_sgvec in one more location To: Greg Kroah-Hartman , stable@vger.kernel.org Cc: Nathan Chancellor , "Jason A . Donenfeld" , Sergei Shtylyov , "Michael S. Tsirkin" , Jason Wang , "David S . Miller" Message-ID: <20180410012150.6573-4-natechancellor@gmail.com> From: Nathan Chancellor 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 Cc: Sergei Shtylyov Cc: "Michael S. Tsirkin" Cc: Jason Wang Cc: David S. Miller Signed-off-by: Nathan Chancellor Signed-off-by: Greg Kroah-Hartman --- 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) Patches currently in stable-queue which might be from natechancellor@gmail.com are queue-3.18/ipsec-check-return-value-of-skb_to_sgvec-always.patch queue-3.18/rxrpc-check-return-value-of-skb_to_sgvec-always.patch queue-3.18/virtio_net-check-return-value-of-skb_to_sgvec-always.patch queue-3.18/virtio_net-check-return-value-of-skb_to_sgvec-in-one-more-location.patch