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 4/5] macsec: check return value of skb_to_sgvec always Date: Tue, 25 Apr 2017 20:47:33 +0200 [thread overview] Message-ID: <20170425184734.26563-4-Jason@zx2c4.com> (raw) In-Reply-To: <20170425184734.26563-1-Jason@zx2c4.com> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> --- drivers/net/macsec.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c index dbab05afcdbe..d846f42b99ec 100644 --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -733,7 +733,12 @@ static struct sk_buff *macsec_encrypt(struct sk_buff *skb, macsec_fill_iv(iv, secy->sci, pn); sg_init_table(sg, MAX_SKB_FRAGS + 1); - skb_to_sgvec(skb, sg, 0, skb->len); + ret = skb_to_sgvec(skb, sg, 0, skb->len); + if (unlikely(ret < 0)) { + macsec_txsa_put(tx_sa); + kfree_skb(skb); + return ERR_PTR(ret); + } if (tx_sc->encrypt) { int len = skb->len - macsec_hdr_len(sci_present) - @@ -937,7 +942,11 @@ static struct sk_buff *macsec_decrypt(struct sk_buff *skb, macsec_fill_iv(iv, sci, ntohl(hdr->packet_number)); sg_init_table(sg, MAX_SKB_FRAGS + 1); - skb_to_sgvec(skb, sg, 0, skb->len); + ret = skb_to_sgvec(skb, sg, 0, skb->len); + if (unlikely(ret < 0)) { + kfree_skb(skb); + return ERR_PTR(ret); + } if (hdr->tci_an & MACSEC_TCI_E) { /* confidentiality: ethernet + macsec header -- 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, David.Laight@aculab.com, kernel-hardening@lists.openwall.com, davem@davemloft.net Cc: "Jason A. Donenfeld" <Jason@zx2c4.com> Subject: [kernel-hardening] [PATCH v6 4/5] macsec: check return value of skb_to_sgvec always Date: Tue, 25 Apr 2017 20:47:33 +0200 [thread overview] Message-ID: <20170425184734.26563-4-Jason@zx2c4.com> (raw) In-Reply-To: <20170425184734.26563-1-Jason@zx2c4.com> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> --- drivers/net/macsec.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c index dbab05afcdbe..d846f42b99ec 100644 --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -733,7 +733,12 @@ static struct sk_buff *macsec_encrypt(struct sk_buff *skb, macsec_fill_iv(iv, secy->sci, pn); sg_init_table(sg, MAX_SKB_FRAGS + 1); - skb_to_sgvec(skb, sg, 0, skb->len); + ret = skb_to_sgvec(skb, sg, 0, skb->len); + if (unlikely(ret < 0)) { + macsec_txsa_put(tx_sa); + kfree_skb(skb); + return ERR_PTR(ret); + } if (tx_sc->encrypt) { int len = skb->len - macsec_hdr_len(sci_present) - @@ -937,7 +942,11 @@ static struct sk_buff *macsec_decrypt(struct sk_buff *skb, macsec_fill_iv(iv, sci, ntohl(hdr->packet_number)); sg_init_table(sg, MAX_SKB_FRAGS + 1); - skb_to_sgvec(skb, sg, 0, skb->len); + ret = skb_to_sgvec(skb, sg, 0, skb->len); + if (unlikely(ret < 0)) { + kfree_skb(skb); + return ERR_PTR(ret); + } if (hdr->tci_an & MACSEC_TCI_E) { /* confidentiality: ethernet + macsec header -- 2.12.2
next prev parent reply other threads:[~2017-04-25 18:48 UTC|newest] Thread overview: 61+ 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 ` [kernel-hardening] " 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 ` Jason A. Donenfeld [this message] 2017-04-25 18:47 ` [kernel-hardening] [PATCH v6 4/5] macsec: " 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=20170425184734.26563-4-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.