Commit cda7ea69 authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by David S. Miller

macsec: check return value of skb_to_sgvec always

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>
parent 89a5ea99
...@@ -740,7 +740,12 @@ static struct sk_buff *macsec_encrypt(struct sk_buff *skb, ...@@ -740,7 +740,12 @@ static struct sk_buff *macsec_encrypt(struct sk_buff *skb,
macsec_fill_iv(iv, secy->sci, pn); macsec_fill_iv(iv, secy->sci, pn);
sg_init_table(sg, ret); 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) { if (tx_sc->encrypt) {
int len = skb->len - macsec_hdr_len(sci_present) - int len = skb->len - macsec_hdr_len(sci_present) -
...@@ -947,7 +952,11 @@ static struct sk_buff *macsec_decrypt(struct sk_buff *skb, ...@@ -947,7 +952,11 @@ static struct sk_buff *macsec_decrypt(struct sk_buff *skb,
macsec_fill_iv(iv, sci, ntohl(hdr->packet_number)); macsec_fill_iv(iv, sci, ntohl(hdr->packet_number));
sg_init_table(sg, ret); 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) { if (hdr->tci_an & MACSEC_TCI_E) {
/* confidentiality: ethernet + macsec header /* confidentiality: ethernet + macsec header
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment