Patch "macsec: check return value of skb_to_sgvec always" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
macsec: check return value of skb_to_sgvec always
to the 4.9-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:
macsec-check-return-value-of-skb_to_sgvec-always.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Mon Apr 9 17:09:24 CEST 2018
From: "Jason A. Donenfeld" <[email protected]>
Date: Sun, 4 Jun 2017 04:16:25 +0200
Subject: macsec: check return value of skb_to_sgvec always
From: "Jason A. Donenfeld" <[email protected]>
[ Upstream commit cda7ea6903502af34015000e16be290a79f07638 ]
--- drivers/net/macsec.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/net/macsec.c +11 -2
@@ -742,7 +742,12 @@ static struct sk_buff *macsec_encrypt(stmacsec_fill_iv (iv, secy->sci, pn);sg_init_table (sg, ret); -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) -
@@ -949,7 +954,11 @@ static struct sk_buff *macsec_decrypt(stmacsec_fill_iv (iv, sci,ntohl (hdr->packet_number));sg_init_table (sg, ret); -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
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/ipsec-check-return-value-of-skb_to_sgvec-always.patch queue-4.9/skbuff-return-emsgsize-in-skb_to_sgvec-to-prevent-overflow.patch queue-4.9/macsec-check-return-value-of-skb_to_sgvec-always.patch