hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

macsec: check return value of skb_to_sgvec always 

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jason A. Donenfeld 2017-06-04 04:16:25 +02:00 committed by David S. Miller
parent 89a5ea9966
commit cda7ea6903
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/macsec.c
View File

@ -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,
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