projects
/
wrapfs-4.13.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a74512a
)
macsec: fix memory leaks when skb_to_sgvec fails
author
Sabrina Dubroca
<sd@queasysnail.net>
Tue, 10 Oct 2017 15:07:12 +0000
(17:07 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sat, 18 Nov 2017 10:30:36 +0000
(11:30 +0100)
[ Upstream commit
5aba2ba5030b66a6f8c93049b718556f9aacd7c6
]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/macsec.c
patch
|
blob
|
history
diff --git
a/drivers/net/macsec.c
b/drivers/net/macsec.c
index 98e4deaa3a6a1c2f89d55e8f2db54b6fc93380be..5ab1b8849c30496966be05115f752bfcf3385950 100644
(file)
--- a/
drivers/net/macsec.c
+++ b/
drivers/net/macsec.c
@@
-742,6
+742,7
@@
static struct sk_buff *macsec_encrypt(struct sk_buff *skb,
sg_init_table(sg, ret);
ret = skb_to_sgvec(skb, sg, 0, skb->len);
if (unlikely(ret < 0)) {
+ aead_request_free(req);
macsec_txsa_put(tx_sa);
kfree_skb(skb);
return ERR_PTR(ret);
@@
-954,6
+955,7
@@
static struct sk_buff *macsec_decrypt(struct sk_buff *skb,
sg_init_table(sg, ret);
ret = skb_to_sgvec(skb, sg, 0, skb->len);
if (unlikely(ret < 0)) {
+ aead_request_free(req);
kfree_skb(skb);
return ERR_PTR(ret);
}