From: "Jason A. Donenfeld" <Jason@zx2c4.com> To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, davem@davemloft.net, David.Laight@aculab.com, kernel-hardening@lists.openwall.com Cc: "Jason A. Donenfeld" <Jason@zx2c4.com> Subject: [PATCH 1/5] skbuff: return -EMSGSIZE in skb_to_sgvec to prevent overflow Date: Tue, 25 Apr 2017 16:08:05 +0200 [thread overview] Message-ID: <20170425140809.23881-1-Jason@zx2c4.com> (raw) This is a defense-in-depth measure in response to bugs like 4d6fa57b4dab0d77f4d8e9d9c73d1e63f6fe8fee. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> --- net/core/skbuff.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index f86bf69cfb8d..3c2a7f323722 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3489,7 +3489,9 @@ void __init skb_init(void) * @len: Length of buffer space to be mapped * * Fill the specified scatter-gather list with mappings/pointers into a - * region of the buffer space attached to a socket buffer. + * region of the buffer space attached to a socket buffer. Returns either + * the number of scatterlist items used, or -EMSGSIZE if the contents + * could not fit. */ static int __skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len) @@ -3512,6 +3514,9 @@ __skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len) for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { int end; + if (elt && sg_is_last(&sg[elt - 1])) + return -EMSGSIZE; + WARN_ON(start > offset + len); end = start + skb_frag_size(&skb_shinfo(skb)->frags[i]); @@ -3535,6 +3540,9 @@ __skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len) WARN_ON(start > offset + len); + if (elt && sg_is_last(&sg[elt - 1])) + return -EMSGSIZE; + end = start + frag_iter->len; if ((copy = end - offset) > 0) { if (copy > len) -- 2.12.2
WARNING: multiple messages have this Message-ID (diff)
From: "Jason A. Donenfeld" <Jason@zx2c4.com> To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, davem@davemloft.net, David.Laight@aculab.com, kernel-hardening@lists.openwall.com Cc: "Jason A. Donenfeld" <Jason@zx2c4.com> Subject: [kernel-hardening] [PATCH 1/5] skbuff: return -EMSGSIZE in skb_to_sgvec to prevent overflow Date: Tue, 25 Apr 2017 16:08:05 +0200 [thread overview] Message-ID: <20170425140809.23881-1-Jason@zx2c4.com> (raw) This is a defense-in-depth measure in response to bugs like 4d6fa57b4dab0d77f4d8e9d9c73d1e63f6fe8fee. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> --- net/core/skbuff.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index f86bf69cfb8d..3c2a7f323722 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3489,7 +3489,9 @@ void __init skb_init(void) * @len: Length of buffer space to be mapped * * Fill the specified scatter-gather list with mappings/pointers into a - * region of the buffer space attached to a socket buffer. + * region of the buffer space attached to a socket buffer. Returns either + * the number of scatterlist items used, or -EMSGSIZE if the contents + * could not fit. */ static int __skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len) @@ -3512,6 +3514,9 @@ __skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len) for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { int end; + if (elt && sg_is_last(&sg[elt - 1])) + return -EMSGSIZE; + WARN_ON(start > offset + len); end = start + skb_frag_size(&skb_shinfo(skb)->frags[i]); @@ -3535,6 +3540,9 @@ __skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len) WARN_ON(start > offset + len); + if (elt && sg_is_last(&sg[elt - 1])) + return -EMSGSIZE; + end = start + frag_iter->len; if ((copy = end - offset) > 0) { if (copy > len) -- 2.12.2
next reply other threads:[~2017-04-25 14:08 UTC|newest] Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-25 14:08 Jason A. Donenfeld [this message] 2017-04-25 14:08 ` [kernel-hardening] [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 ` [kernel-hardening] " Jason A. Donenfeld 2017-04-25 14:08 ` [PATCH 3/5] rxrpc: " Jason A. Donenfeld 2017-04-25 14:08 ` [kernel-hardening] " Jason A. Donenfeld 2017-04-25 14:08 ` [PATCH 4/5] macsec: " Jason A. Donenfeld 2017-04-25 14:08 ` [kernel-hardening] " Jason A. Donenfeld 2017-04-25 14:08 ` [PATCH 5/5] virtio_net: " Jason A. Donenfeld 2017-04-25 14:08 ` [kernel-hardening] " 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:16 ` [kernel-hardening] " Jason A. Donenfeld 2017-04-25 14:21 ` [PATCH v3 " Jason A. Donenfeld 2017-04-25 14:21 ` [kernel-hardening] " Jason A. Donenfeld 2017-04-25 14:47 ` [PATCH " David Miller 2017-04-25 14:47 ` [kernel-hardening] " David Miller 2017-04-25 15:04 ` [PATCH v4 " Jason A. Donenfeld 2017-04-25 15:04 ` [kernel-hardening] " Jason A. Donenfeld 2017-04-25 15:17 ` David Miller 2017-04-25 15:17 ` [kernel-hardening] " David Miller 2017-04-25 15:52 ` [PATCH v5 " Jason A. Donenfeld 2017-04-25 15:52 ` [kernel-hardening] " 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 ` [kernel-hardening] " Jason A. Donenfeld 2017-04-25 15:52 ` [PATCH v5 3/5] rxrpc: " Jason A. Donenfeld 2017-04-25 15:52 ` [kernel-hardening] " Jason A. Donenfeld 2017-04-25 15:52 ` [PATCH v5 4/5] macsec: " Jason A. Donenfeld 2017-04-25 15:52 ` [kernel-hardening] " Jason A. Donenfeld 2017-04-25 15:52 ` [PATCH v5 5/5] virtio_net: " Jason A. Donenfeld 2017-04-25 15:52 ` [kernel-hardening] " 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 ` [kernel-hardening] " 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 ` [kernel-hardening] " Jason A. Donenfeld 2017-04-25 18:47 ` [PATCH v6 3/5] rxrpc: " Jason A. Donenfeld 2017-04-25 18:47 ` [kernel-hardening] " Jason A. Donenfeld 2017-04-28 11:41 ` Sabrina Dubroca 2017-04-28 11:41 ` [kernel-hardening] " Sabrina Dubroca 2017-04-28 13:29 ` Jason A. Donenfeld 2017-04-28 13:29 ` [kernel-hardening] " Jason A. Donenfeld 2017-04-25 18:47 ` [PATCH v6 4/5] macsec: " Jason A. Donenfeld 2017-04-25 18:47 ` [kernel-hardening] " Jason A. Donenfeld 2017-04-25 18:47 ` [PATCH v6 5/5] virtio_net: " Jason A. Donenfeld 2017-04-25 18:47 ` [kernel-hardening] " Jason A. Donenfeld 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 9:21 ` [kernel-hardening] " Jason A. Donenfeld 2017-04-27 11:30 ` Sabrina Dubroca 2017-04-27 11:30 ` [kernel-hardening] " Sabrina Dubroca 2017-04-27 12:04 ` Jason A. Donenfeld 2017-04-27 12:04 ` [kernel-hardening] " Jason A. Donenfeld 2017-04-27 14:54 ` David Laight 2017-04-27 14:54 ` [kernel-hardening] " David Laight 2017-04-27 14:54 ` David Laight 2017-04-27 15:54 ` David Miller 2017-04-27 15:54 ` [kernel-hardening] " David Miller 2017-04-28 16:18 ` Sabrina Dubroca 2017-04-28 16:18 ` [kernel-hardening] " Sabrina Dubroca 2017-04-28 22:47 ` Jason A. Donenfeld 2017-04-28 22:47 ` [kernel-hardening] " Jason A. Donenfeld 2017-04-25 15:42 ` [PATCH " Sergei Shtylyov 2017-04-25 15:42 ` [kernel-hardening] " 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=20170425140809.23881-1-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.