From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
David.Laight@aculab.com, kernel-hardening@lists.openwall.com,
davem@davemloft.net
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>
Subject: [PATCH v6 5/5] virtio_net: check return value of skb_to_sgvec always
Date: Tue, 25 Apr 2017 20:47:34 +0200 [thread overview]
Message-ID: <20170425184734.26563-5-Jason@zx2c4.com> (raw)
In-Reply-To: <20170425184734.26563-1-Jason@zx2c4.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
drivers/net/virtio_net.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index f36584616e7d..1709fd0b4bf7 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1081,7 +1081,7 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb)
struct virtio_net_hdr_mrg_rxbuf *hdr;
const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest;
struct virtnet_info *vi = sq->vq->vdev->priv;
- unsigned num_sg;
+ int num_sg;
unsigned hdr_len = vi->hdr_len;
bool can_push;
@@ -1114,6 +1114,8 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb)
sg_set_buf(sq->sg, hdr, hdr_len);
num_sg = skb_to_sgvec(skb, sq->sg + 1, 0, skb->len) + 1;
}
+ if (unlikely(num_sg < 0))
+ return num_sg;
return virtqueue_add_outbuf(sq->vq, sq->sg, num_sg, skb, GFP_ATOMIC);
}
--
2.12.2
next prev parent reply other threads:[~2017-04-25 18:48 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-25 14:08 [PATCH 1/5] skbuff: return -EMSGSIZE in skb_to_sgvec to prevent overflow Jason A. Donenfeld
2017-04-25 14:08 ` [PATCH 2/5] ipsec: check return value of skb_to_sgvec always Jason A. Donenfeld
2017-04-25 14:08 ` [PATCH 3/5] rxrpc: " Jason A. Donenfeld
2017-04-25 14:08 ` [PATCH 4/5] macsec: " Jason A. Donenfeld
2017-04-25 14:08 ` [PATCH 5/5] virtio_net: " Jason A. Donenfeld
2017-04-25 14:16 ` [PATCH v2 1/5] skbuff: return -EMSGSIZE in skb_to_sgvec to prevent overflow Jason A. Donenfeld
2017-04-25 14:21 ` [PATCH v3 " Jason A. Donenfeld
2017-04-25 14:47 ` [PATCH " David Miller
2017-04-25 15:04 ` [PATCH v4 " Jason A. Donenfeld
2017-04-25 15:17 ` David Miller
2017-04-25 15:52 ` [PATCH v5 " Jason A. Donenfeld
2017-04-25 15:52 ` [PATCH v5 2/5] ipsec: check return value of skb_to_sgvec always Jason A. Donenfeld
2017-04-25 15:52 ` [PATCH v5 3/5] rxrpc: " Jason A. Donenfeld
2017-04-25 15:52 ` [PATCH v5 4/5] macsec: " Jason A. Donenfeld
2017-04-25 15:52 ` [PATCH v5 5/5] virtio_net: " Jason A. Donenfeld
2017-04-25 18:47 ` [PATCH v6 1/5] skbuff: return -EMSGSIZE in skb_to_sgvec to prevent overflow Jason A. Donenfeld
2017-04-25 18:47 ` [PATCH v6 2/5] ipsec: check return value of skb_to_sgvec always Jason A. Donenfeld
2017-04-25 18:47 ` [PATCH v6 3/5] rxrpc: " Jason A. Donenfeld
2017-04-28 11:41 ` Sabrina Dubroca
2017-04-28 13:29 ` Jason A. Donenfeld
2017-04-25 18:47 ` [PATCH v6 4/5] macsec: " Jason A. Donenfeld
2017-04-25 18:47 ` Jason A. Donenfeld [this message]
2017-04-27 9:21 ` [PATCH v6 1/5] skbuff: return -EMSGSIZE in skb_to_sgvec to prevent overflow Jason A. Donenfeld
2017-04-27 11:30 ` Sabrina Dubroca
2017-04-27 12:04 ` Jason A. Donenfeld
2017-04-27 14:54 ` David Laight
2017-04-27 15:54 ` David Miller
2017-04-28 16:18 ` Sabrina Dubroca
2017-04-28 22:47 ` Jason A. Donenfeld
2017-04-25 15:42 ` [PATCH " Sergei Shtylyov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170425184734.26563-5-Jason@zx2c4.com \
--to=jason@zx2c4.com \
--cc=David.Laight@aculab.com \
--cc=davem@davemloft.net \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).