linux-kernel - Re: [PATCH] af_key: Fix memory leak in key_notify

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20190614095922.k5yzeyew2zhrfp7e@azazel.net>
Date:   Fri, 14 Jun 2019 10:59:22 +0100
From:   Jeremy Sowden <jeremy@...zel.net>
To:     Steffen Klassert <steffen.klassert@...unet.com>, g@...zel.net
Cc:     Young Xiao <92siuyang@...il.com>, herbert@...dor.apana.org.au,
        davem@...emloft.net, netdev@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH] af_key: Fix memory leak in key_notify_policy.

On 2019-06-14, at 10:53:46 +0200, Steffen Klassert wrote:
> On Fri, Jun 14, 2019 at 04:26:26PM +0800, Young Xiao wrote:
> > We leak the allocated out_skb in case pfkey_xfrm_policy2msg() fails.
> > Fix this by freeing it on error.
> >
> > Signed-off-by: Young Xiao <92siuyang@...il.com>
> > ---
> >  net/key/af_key.c | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/net/key/af_key.c b/net/key/af_key.c
> > index 4af1e1d..ec414f6 100644
> > --- a/net/key/af_key.c
> > +++ b/net/key/af_key.c
> > @@ -2443,6 +2443,7 @@ static int key_pol_get_resp(struct sock *sk, struct xfrm_policy *xp, const struc
> >  	}
> >  	err = pfkey_xfrm_policy2msg(out_skb, xp, dir);
> >  	if (err < 0)
> > +		kfree_skb(out_skb);
> >  		goto out;
>
> Did you test this?
>
> You need to add braces, otherwise 'goto out' will happen unconditionally.
>
> >
> >  	out_hdr = (struct sadb_msg *) out_skb->data;
> > @@ -2695,6 +2696,7 @@ static int dump_sp(struct xfrm_policy *xp, int dir, int count, void *ptr)
> >
> >  	err = pfkey_xfrm_policy2msg(out_skb, xp, dir);
> >  	if (err < 0)
> > +		kfree_skb(out_skb);
> >  		return err;
>
> Same here.

There's already a patch for this:

  https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git/commit/?id=7c80eb1c7e2b8420477fbc998971d62a648035d9

J.

Download attachment "signature.asc" of type "application/pgp-signature" (834 bytes)