linux-kernel - Re: [PATCH] jfs: jump to error_out when filemap_{fdatawait, write_and

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

Message-ID: <f8392112-ba3f-1cec-adfb-13c977458d04@oracle.com>
Date:   Mon, 29 Aug 2016 15:53:08 -0500
From:   Dave Kleikamp <dave.kleikamp@...cle.com>
To:     Quorum Laval <quorum.laval@...il.com>
Cc:     jfs-discussion@...ts.sourceforge.net, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] jfs: jump to error_out when filemap_{fdatawait,
 write_and_wait} fails

On 08/26/2016 09:40 AM, Quorum Laval wrote:
> filemap_fdatawait/filemap_write_and_wait may fail, so check the return
> value and jump to error_out in the case of error.
> 
> Signed-off-by: Quorum Laval <quorum.laval@...il.com>

This looks good. I'll push it upstream.

Thanks,
Dave

> ---
>  fs/jfs/resize.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/jfs/resize.c b/fs/jfs/resize.c
> index 90b3bc2..bd9b641 100644
> --- a/fs/jfs/resize.c
> +++ b/fs/jfs/resize.c
> @@ -379,8 +379,14 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)
>  	 * cached in meta-data cache, and not written out
>  	 * by txCommit();
>  	 */
> -	filemap_fdatawait(ipbmap->i_mapping);
> -	filemap_write_and_wait(ipbmap->i_mapping);
> +	rc = filemap_fdatawait(ipbmap->i_mapping);
> +	if (rc)
> +		goto error_out;
> +
> +	rc = filemap_write_and_wait(ipbmap->i_mapping);
> +	if (rc)
> +		goto error_out;
> +
>  	diWriteSpecial(ipbmap, 0);
>  
>  	newPage = nPages;	/* first new page number */
>