From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
Steffen Klassert <steffen.klassert@secunet.com>,
<netdev@vger.kernel.org>
Subject: [PATCH 5/5] esp6: fix memleak on error path in esp6_input
Date: Fri, 27 Jul 2018 08:51:54 +0200 [thread overview]
Message-ID: <20180727065154.28557-6-steffen.klassert@secunet.com> (raw)
In-Reply-To: <20180727065154.28557-1-steffen.klassert@secunet.com>
From: Zhen Lei <thunder.leizhen@huawei.com>
This ought to be an omission in e6194923237 ("esp: Fix memleaks on error
paths."). The memleak on error path in esp6_input is similar to esp_input
of esp4.
Fixes: e6194923237 ("esp: Fix memleaks on error paths.")
Fixes: 3f29770723f ("ipsec: check return value of skb_to_sgvec always")
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
net/ipv6/esp6.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 97513f35bcc5..88a7579c23bd 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -669,8 +669,10 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)
sg_init_table(sg, nfrags);
ret = skb_to_sgvec(skb, sg, 0, skb->len);
- if (unlikely(ret < 0))
+ if (unlikely(ret < 0)) {
+ kfree(tmp);
goto out;
+ }
skb->ip_summed = CHECKSUM_NONE;
--
2.14.1
next prev parent reply other threads:[~2018-07-27 8:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-27 6:51 pull request (net): ipsec 2018-07-27 Steffen Klassert
2018-07-27 6:51 ` [PATCH 1/5] vti6: fix PMTU caching and reporting on xmit Steffen Klassert
2018-07-27 6:51 ` [PATCH 2/5] xfrm_user: prevent leaking 2 bytes of kernel memory Steffen Klassert
2018-07-27 6:51 ` [PATCH 3/5] xfrm: fix missing dst_release() after policy blocking lbcast and multicast Steffen Klassert
2018-07-27 6:51 ` [PATCH 4/5] xfrm: free skb if nlsk pointer is NULL Steffen Klassert
2018-07-27 6:51 ` Steffen Klassert [this message]
2018-07-27 16:20 ` pull request (net): ipsec 2018-07-27 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180727065154.28557-6-steffen.klassert@secunet.com \
--to=steffen.klassert@secunet.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.