linux-ext4 - Re: [PATCH] PING ext4: fix double unlock buffer mess during fs-resize

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]

Message-ID: <87d31aw2e9.fsf@openvz.org>
Date:	Tue, 25 Sep 2012 19:25:18 +0400
From:	Dmitry Monakhov <dmonakhov@...nvz.org>
To:	linux-ext4@...r.kernel.org
Cc:	tytso@....edu, djwong@...ibm.com
Subject: Re: [PATCH] PING  ext4: fix double unlock buffer mess during fs-resize

On Fri,  7 Sep 2012 14:14:44 +0400, Dmitry Monakhov <dmonakhov@...nvz.org> wrote:
> bh_submit_read() is responsible for unlock bh on endio
> 
Hi, are any objections against this fix?
> Signed-off-by: Dmitry Monakhov <dmonakhov@...nvz.org>
> ---
>  fs/ext4/resize.c |   15 +++++----------
>  1 files changed, 5 insertions(+), 10 deletions(-)
> 
> diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
> index 41f6ef6..3b05198 100644
> --- a/fs/ext4/resize.c
> +++ b/fs/ext4/resize.c
> @@ -1076,17 +1076,12 @@ static struct buffer_head *ext4_get_bitmap(struct super_block *sb, __u64 block)
>  	struct buffer_head *bh = sb_getblk(sb, block);
>  	if (!bh)
>  		return NULL;
> -
> -	if (bitmap_uptodate(bh))
> -		return bh;
> -
> -	lock_buffer(bh);
> -	if (bh_submit_read(bh) < 0) {
> -		unlock_buffer(bh);
> -		brelse(bh);
> -		return NULL;
> +	if (!bh_uptodate_or_lock(bh)) {
> +		if (bh_submit_read(bh) < 0) {
> +			brelse(bh);
> +			return NULL;
> +		}
>  	}
> -	unlock_buffer(bh);
>  
>  	return bh;
>  }
> -- 
> 1.7.7.6
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html