Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 14 Jun 2019 10:59:22 +0100
From:   Jeremy Sowden <jeremy@azazel.net>
To:     Steffen Klassert <steffen.klassert@secunet.com>, g@azazel.net
Cc:     Young Xiao <92siuyang@gmail.com>, herbert@gondor.apana.org.au,
        davem@davemloft.net, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] af_key: Fix memory leak in key_notify_policy.
Message-ID: <20190614095922.k5yzeyew2zhrfp7e@azazel.net>
References: <1560500786-572-1-git-send-email-92siuyang@gmail.com>
 <20190614085346.GN17989@gauss3.secunet.de>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="okvcvc2i7gz2dbyk"
Content-Disposition: inline
In-Reply-To: <20190614085346.GN17989@gauss3.secunet.de>
User-Agent: NeoMutt/20170113 (1.7.2)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


--okvcvc2i7gz2dbyk
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

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@gmail.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.

--okvcvc2i7gz2dbyk
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEZ8d+2N/NBLDbUxIF0Z7UzfnX9sMFAl0Db/kACgkQ0Z7UzfnX
9sO+dg//X5IBarNnBL4+mJo1PVkihtoJNZib7SkyNpJjU74rQ5lfILTPWBKkxOHD
LFQt62krPp/IUE328UQthubS8BbJWSDJ7BF9HUtHlme2nZoxjgfPxvn3EvAkhQTn
DjoeP9hOrRgn1ufCqU09n+drVOl/tTxOZIuGK4XT0j0Ycp4PpW3fPng3gs5x4eNS
YPrLZU51nOU46GQW8b60BSgoG5h2YytLwJ4kicaJGjZxhZZOtKycrX5oc5YnnU8Z
ki7zUF/eU5Hni231wjhJBLs8uNTtll7g8Nl8oYogDlCo1EwFukScqS9dPXev7SKZ
4W9Xm8xP2aHAGvylJJhvFpqQ/gR5U9MkXr+gmc6uachuiZrbp3zCDyKgYt+hxZG9
lnLjLKxNm4Bc+Wwn38BvoBcg03q850BEUGdfANpM1l/aFS+va27MFGX0wnWFsVfV
ChOS0BfrqrOwpvLFUjFN7Ojvli+9Qs+KWiwHzp7dJFltnntif1J8i27T6v0cjQBL
irphre+3e96UgilQ/1+ygZQi/h4SwQzt8yEfGXo3Gx8sGb7VSaYS43oW3jzhH4Rm
WgQWyFnlzbUtaz/SZMXvj5vUaQhTUjpVHG/Ws5vkEE+ED7CGdu0r4J1j0+EfLQOi
TJPyklntEQv4rzJHQK18+InPJgQ7HTox2Yft8rfjEZ2dSa2R6UI=
=Llij
-----END PGP SIGNATURE-----

--okvcvc2i7gz2dbyk--