mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jeff Layton <jlayton@kernel.org>
To: Wenwen Wang <wenwen@cs.uga.edu>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>,
	"J. Bruce Fields" <bfields@fieldses.org>,
	"open list:FILESYSTEMS (VFS and infrastructure)" 
	<linux-fsdevel@vger.kernel.org>,
	open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] locks: fix a memory leak bug
Date: Tue, 20 Aug 2019 05:51:22 -0400	[thread overview]
Message-ID: <25478fb3102ecebe09297948dcbb666c22845de1.camel@kernel.org> (raw)
In-Reply-To: <1566258454-7684-1-git-send-email-wenwen@cs.uga.edu>

On Mon, 2019-08-19 at 18:47 -0500, Wenwen Wang wrote:
> In __break_lease(), the file lock 'new_fl' is allocated in lease_alloc().
> However, it is not deallocated in the following execution if
> smp_load_acquire() fails, leading to a memory leak bug. To fix this issue,
> free 'new_fl' before returning the error.
> 
> Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu>
> ---
>  fs/locks.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/locks.c b/fs/locks.c
> index 686eae2..5993b2a 100644
> --- a/fs/locks.c
> +++ b/fs/locks.c
> @@ -1592,7 +1592,7 @@ int __break_lease(struct inode *inode, unsigned int mode, unsigned int type)
>  	ctx = smp_load_acquire(&inode->i_flctx);
>  	if (!ctx) {
>  		WARN_ON_ONCE(1);
> -		return error;
> +		goto free_lock;
>  	}
>  
>  	percpu_down_read(&file_rwsem);
> @@ -1672,6 +1672,7 @@ int __break_lease(struct inode *inode, unsigned int mode, unsigned int type)
>  	spin_unlock(&ctx->flc_lock);
>  	percpu_up_read(&file_rwsem);
>  	locks_dispose_list(&dispose);
> +free_lock:
>  	locks_free_lock(new_fl);
>  	return error;
>  }

Good catch! Merged for v5.4. Let me know if you think this needs to go
in earlier and/or to stable kernels.

Thanks,
-- 
Jeff Layton <jlayton@kernel.org>


      reply	other threads:[~2019-08-20  9:51 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-19 23:47 Wenwen Wang
2019-08-20  9:51 ` Jeff Layton [this message]

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=25478fb3102ecebe09297948dcbb666c22845de1.camel@kernel.org \
    --to=jlayton@kernel.org \
    --cc=bfields@fieldses.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    --cc=wenwen@cs.uga.edu \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome