linux-kernel - Re: [PATCH] btrfs: fix incorrect error return ret being passed to mapping_set

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: <20170509185855.GB17312@lim.localdomain>
Date:   Tue, 9 May 2017 11:58:55 -0700
From:   Liu Bo <bo.li.liu@...cle.com>
To:     Colin King <colin.king@...onical.com>
Cc:     Chris Mason <clm@...com>, Josef Bacik <jbacik@...com>,
        David Sterba <dsterba@...e.com>, linux-btrfs@...r.kernel.org,
        kernel-janitors@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] btrfs: fix incorrect error return ret being passed to
 mapping_set_error

On Tue, May 09, 2017 at 06:14:01PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@...onical.com>
> 
> The setting of return code ret should be based on the error code
> passed into function end_extent_writepage and not on ret. Thanks
> to Liu Bo for spotting this mistake in the original fix I submitted.
> 
> Detected by CoverityScan, CID#1414312 ("Logically dead code")

Looks good.

Reviewed-by: Liu Bo <bo.li.liu@...cle.com>

Thanks,

-liubo
> 
> Fixes: 5dca6eea91653e ("Btrfs: mark mapping with error flag to report errors to userspace")
> Signed-off-by: Colin Ian King <colin.king@...onical.com>
> ---
>  fs/btrfs/extent_io.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
> index d8da3edf2ac3..7c6a032df585 100644
> --- a/fs/btrfs/extent_io.c
> +++ b/fs/btrfs/extent_io.c
> @@ -2458,7 +2458,7 @@ void end_extent_writepage(struct page *page, int err, u64 start, u64 end)
>  	if (!uptodate) {
>  		ClearPageUptodate(page);
>  		SetPageError(page);
> -		ret = ret < 0 ? ret : -EIO;
> +		ret = err < 0 ? err : -EIO;
>  		mapping_set_error(page->mapping, ret);
>  	}
>  }
> -- 
> 2.11.0
>