Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6083f162 authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Greg Kroah-Hartman
Browse files

macsec: check return value of skb_to_sgvec always 




[ Upstream commit cda7ea6903502af34015000e16be290a79f07638 ]

Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Cc: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2cd3aa5a

drivers/net/macsec.c

+11 −2
Original line number Diff line number Diff line
@@ -742,7 +742,12 @@ static struct sk_buff *macsec_encrypt(struct sk_buff *skb, 
	macsec_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(struct sk_buff *skb, 
	macsec_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