* [PATCH net] xfrm: Fix memory leak of aead algorithm name
@ 2016-09-18 7:42 Ilan Tayari
2016-09-18 17:39 ` Rami Rosen
2016-09-19 11:07 ` Steffen Klassert
0 siblings, 2 replies; 3+ messages in thread
From: Ilan Tayari @ 2016-09-18 7:42 UTC (permalink / raw)
To: Steffen Klassert, Herbert Xu; +Cc: netdev@vger.kernel.org
commit 1a6509d99122 ("[IPSEC]: Add support for combined mode algorithms")
introduced aead. The function attach_aead kmemdup()s the algorithm
name during xfrm_state_construct().
However this memory is never freed.
Implementation has since been slightly modified in
commit ee5c23176fcc ("xfrm: Clone states properly on migration")
without resolving this leak.
This patch adds a kfree() call for the aead algorithm name.
Fixes: 1a6509d99122 ("[IPSEC]: Add support for combined mode algorithms")
Signed-off-by: Ilan Tayari <ilant@mellanox.com>
---
net/xfrm/xfrm_state.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 9895a8c..a30f898d 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -332,6 +332,7 @@ static void xfrm_state_gc_destroy(struct xfrm_state *x)
{
tasklet_hrtimer_cancel(&x->mtimer);
del_timer_sync(&x->rtimer);
+ kfree(x->aead);
kfree(x->aalg);
kfree(x->ealg);
kfree(x->calg);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net] xfrm: Fix memory leak of aead algorithm name
2016-09-18 7:42 [PATCH net] xfrm: Fix memory leak of aead algorithm name Ilan Tayari
@ 2016-09-18 17:39 ` Rami Rosen
2016-09-19 11:07 ` Steffen Klassert
1 sibling, 0 replies; 3+ messages in thread
From: Rami Rosen @ 2016-09-18 17:39 UTC (permalink / raw)
To: Ilan Tayari; +Cc: Steffen Klassert, Herbert Xu, netdev@vger.kernel.org
Acked-by: Rami Rosen <roszenrami@gmail.com>
On 18 September 2016 at 10:42, Ilan Tayari <ilant@mellanox.com> wrote:
> commit 1a6509d99122 ("[IPSEC]: Add support for combined mode algorithms")
> introduced aead. The function attach_aead kmemdup()s the algorithm
> name during xfrm_state_construct().
> However this memory is never freed.
> Implementation has since been slightly modified in
> commit ee5c23176fcc ("xfrm: Clone states properly on migration")
> without resolving this leak.
> This patch adds a kfree() call for the aead algorithm name.
>
> Fixes: 1a6509d99122 ("[IPSEC]: Add support for combined mode algorithms")
> Signed-off-by: Ilan Tayari <ilant@mellanox.com>
> ---
> net/xfrm/xfrm_state.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
> index 9895a8c..a30f898d 100644
> --- a/net/xfrm/xfrm_state.c
> +++ b/net/xfrm/xfrm_state.c
> @@ -332,6 +332,7 @@ static void xfrm_state_gc_destroy(struct xfrm_state *x)
> {
> tasklet_hrtimer_cancel(&x->mtimer);
> del_timer_sync(&x->rtimer);
> + kfree(x->aead);
> kfree(x->aalg);
> kfree(x->ealg);
> kfree(x->calg);
> --
> 1.8.3.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net] xfrm: Fix memory leak of aead algorithm name
2016-09-18 7:42 [PATCH net] xfrm: Fix memory leak of aead algorithm name Ilan Tayari
2016-09-18 17:39 ` Rami Rosen
@ 2016-09-19 11:07 ` Steffen Klassert
1 sibling, 0 replies; 3+ messages in thread
From: Steffen Klassert @ 2016-09-19 11:07 UTC (permalink / raw)
To: Ilan Tayari; +Cc: Herbert Xu, netdev@vger.kernel.org
On Sun, Sep 18, 2016 at 07:42:53AM +0000, Ilan Tayari wrote:
> commit 1a6509d99122 ("[IPSEC]: Add support for combined mode algorithms")
> introduced aead. The function attach_aead kmemdup()s the algorithm
> name during xfrm_state_construct().
> However this memory is never freed.
> Implementation has since been slightly modified in
> commit ee5c23176fcc ("xfrm: Clone states properly on migration")
> without resolving this leak.
> This patch adds a kfree() call for the aead algorithm name.
>
> Fixes: 1a6509d99122 ("[IPSEC]: Add support for combined mode algorithms")
> Signed-off-by: Ilan Tayari <ilant@mellanox.com>
Applied to the ipsec tree, thanks Ilan!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-19 11:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-18 7:42 [PATCH net] xfrm: Fix memory leak of aead algorithm name Ilan Tayari
2016-09-18 17:39 ` Rami Rosen
2016-09-19 11:07 ` Steffen Klassert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).