linux-kernel - RE: [PATCH][next] mm/zswap: fix a couple of memory leaks and rework kzalloc failure check

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] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 22 Jun 2020 19:55:14 +0000
From:   "Song Bao Hua (Barry Song)" <song.bao.hua@...ilicon.com>
To:     Dan Carpenter <dan.carpenter@...cle.com>,
        Colin King <colin.king@...onical.com>
CC:     Seth Jennings <sjenning@...hat.com>,
        Dan Streetman <ddstreet@...e.org>,
        Vitaly Wool <vitaly.wool@...sulko.com>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        "linux-mm@...ck.org" <linux-mm@...ck.org>,
        "kernel-janitors@...r.kernel.org" <kernel-janitors@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: RE: [PATCH][next] mm/zswap: fix a couple of memory leaks and rework
 kzalloc failure check



> -----Original Message-----
> From: Dan Carpenter [mailto:dan.carpenter@...cle.com]
> Sent: Tuesday, June 23, 2020 6:28 AM
> To: Colin King <colin.king@...onical.com>
> Cc: Seth Jennings <sjenning@...hat.com>; Dan Streetman
> <ddstreet@...e.org>; Vitaly Wool <vitaly.wool@...sulko.com>; Andrew
> Morton <akpm@...ux-foundation.org>; Song Bao Hua (Barry Song)
> <song.bao.hua@...ilicon.com>; Stephen Rothwell <sfr@...b.auug.org.au>;
> linux-mm@...ck.org; kernel-janitors@...r.kernel.org;
> linux-kernel@...r.kernel.org
> Subject: Re: [PATCH][next] mm/zswap: fix a couple of memory leaks and
> rework kzalloc failure check
> 
> On Mon, Jun 22, 2020 at 04:35:46PM +0100, Colin King wrote:
> > From: Colin Ian King <colin.king@...onical.com>
> >
> > kzalloc failures return NULL on out of memory errors, so replace the
> > IS_ERR_OR_NULL check with the usual null pointer check.  Fix two memory
> > leaks with on acomp and acomp_ctx by ensuring these objects are free'd
> > on the error return path.
> >
> > Addresses-Coverity: ("Resource leak")
> > Fixes: d4f86abd6e35 ("mm/zswap: move to use crypto_acomp API for
> hardware acceleration")
> > Signed-off-by: Colin Ian King <colin.king@...onical.com>


Colin, thanks for your patch. I am sorry I did the same thing with you here:
https://lkml.org/lkml/2020/6/22/347


> > ---
> >  mm/zswap.c | 16 +++++++++++-----
> >  1 file changed, 11 insertions(+), 5 deletions(-)
> >
> > diff --git a/mm/zswap.c b/mm/zswap.c
> > index 0d914ba6b4a0..14839cbac7ff 100644
> > --- a/mm/zswap.c
> > +++ b/mm/zswap.c
> > @@ -433,23 +433,23 @@ static int zswap_cpu_comp_prepare(unsigned int
> cpu, struct hlist_node *node)
> >  		return 0;
> >
> >  	acomp_ctx = kzalloc(sizeof(*acomp_ctx), GFP_KERNEL);
> > -	if (IS_ERR_OR_NULL(acomp_ctx)) {
> > +	if (!acomp_ctx) {
> >  		pr_err("Could not initialize acomp_ctx\n");
> >  		return -ENOMEM;
> >  	}
> >  	acomp = crypto_alloc_acomp(pool->tfm_name, 0, 0);
> > -	if (IS_ERR_OR_NULL(acomp)) {
> > +	if (!acomp) {
> 
> This should be IS_ERR(acomp).  Please preserve the error code.
> 
> >  		pr_err("could not alloc crypto acomp %s : %ld\n",
> >  				pool->tfm_name, PTR_ERR(acomp));
> > -		return -ENOMEM;
> > +		goto free_acomp_ctx;
> >  	}
> >  	acomp_ctx->acomp = acomp;
> >
> >  	req = acomp_request_alloc(acomp_ctx->acomp);
> > -	if (IS_ERR_OR_NULL(req)) {
> > +	if (!req) {
> >  		pr_err("could not alloc crypto acomp %s : %ld\n",
> >  		       pool->tfm_name, PTR_ERR(acomp));
> > -		return -ENOMEM;
> > +		goto free_acomp;
> >  	}
> >  	acomp_ctx->req = req;
> >
> > @@ -462,6 +462,12 @@ static int zswap_cpu_comp_prepare(unsigned int
> cpu, struct hlist_node *node)
> >  	*per_cpu_ptr(pool->acomp_ctx, cpu) = acomp_ctx;
> >
> >  	return 0;
> > +
> > +free_acomp:
> > +	kfree(acomp);
> 
> The kfree() isn't correct.  It needs to be:
> 
> 	crypto_free_acomp(acomp);
> 
> > +free_acomp_ctx:
> > +	kfree(acomp_ctx);
> > +	return -ENOMEM;
> 
> regards,
> dan carpenter