diff options
author | Sabrina Dubroca <sd@queasysnail.net> | 2017-10-10 11:07:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-10-11 17:07:20 -0400 |
commit | 5aba2ba5030b66a6f8c93049b718556f9aacd7c6 (patch) | |
tree | 1806c841ef764418525222567e31d5ca5ac62029 /drivers/net/macsec.c | |
parent | c0576e3975084d4699b7bfef578613fb8e1144f6 (diff) |
macsec: fix memory leaks when skb_to_sgvec fails
Fixes: cda7ea690350 ("macsec: check return value of skb_to_sgvec always")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macsec.c')
-rw-r--r-- | drivers/net/macsec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c index 98e4deaa3a6a..5ab1b8849c30 100644 --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c | |||
@@ -742,6 +742,7 @@ static struct sk_buff *macsec_encrypt(struct sk_buff *skb, | |||
742 | sg_init_table(sg, ret); | 742 | sg_init_table(sg, ret); |
743 | ret = skb_to_sgvec(skb, sg, 0, skb->len); | 743 | ret = skb_to_sgvec(skb, sg, 0, skb->len); |
744 | if (unlikely(ret < 0)) { | 744 | if (unlikely(ret < 0)) { |
745 | aead_request_free(req); | ||
745 | macsec_txsa_put(tx_sa); | 746 | macsec_txsa_put(tx_sa); |
746 | kfree_skb(skb); | 747 | kfree_skb(skb); |
747 | return ERR_PTR(ret); | 748 | return ERR_PTR(ret); |
@@ -954,6 +955,7 @@ static struct sk_buff *macsec_decrypt(struct sk_buff *skb, | |||
954 | sg_init_table(sg, ret); | 955 | sg_init_table(sg, ret); |
955 | ret = skb_to_sgvec(skb, sg, 0, skb->len); | 956 | ret = skb_to_sgvec(skb, sg, 0, skb->len); |
956 | if (unlikely(ret < 0)) { | 957 | if (unlikely(ret < 0)) { |
958 | aead_request_free(req); | ||
957 | kfree_skb(skb); | 959 | kfree_skb(skb); |
958 | return ERR_PTR(ret); | 960 | return ERR_PTR(ret); |
959 | } | 961 | } |