linux-kernel - Re: [PATCH] bcachefs: Add error handling for zlib

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: <xjtejtaya3znotupznz4eywstkjvucxwyo2gf4b6phcwq6a2i5@pqicczp3ty5g>
Date: Wed, 2 Apr 2025 10:15:39 -0400
From: Kent Overstreet <kent.overstreet@...ux.dev>
To: Wentao Liang <vulab@...as.ac.cn>
Cc: linux-bcachefs@...r.kernel.org, linux-kernel@...r.kernel.org, 
	stable@...r.kernel.org
Subject: Re: [PATCH] bcachefs: Add error handling for zlib_deflateInit2()

On Wed, Apr 02, 2025 at 09:45:44PM +0800, Wentao Liang wrote:
> In attempt_compress(), the return value of zlib_deflateInit2() needs to be
> checked. A proper implementation can be found in  pstore_compress().
> 
> Add an error check and return 0 immediately if the initialzation fails.
> 
> Fixes: 986e9842fb68 ("bcachefs: Compression levels")
> Cc: stable@...r.kernel.org
> Signed-off-by: Wentao Liang <vulab@...as.ac.cn>

Applied

> ---
>  fs/bcachefs/compress.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/bcachefs/compress.c b/fs/bcachefs/compress.c
> index f99ff1819597..5af37c40cef0 100644
> --- a/fs/bcachefs/compress.c
> +++ b/fs/bcachefs/compress.c
> @@ -365,13 +365,14 @@ static int attempt_compress(struct bch_fs *c,
>  		};
>  
>  		zlib_set_workspace(&strm, workspace);
> -		zlib_deflateInit2(&strm,
> +		if (zlib_deflateInit2(&strm,
>  				  compression.level
>  				  ? clamp_t(unsigned, compression.level,
>  					    Z_BEST_SPEED, Z_BEST_COMPRESSION)
>  				  : Z_DEFAULT_COMPRESSION,
>  				  Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL,
> -				  Z_DEFAULT_STRATEGY);
> +				  Z_DEFAULT_STRATEGY) != Z_OK)
> +			return 0;
>  
>  		if (zlib_deflate(&strm, Z_FINISH) != Z_STREAM_END)
>  			return 0;
> -- 
> 2.42.0.windows.2
>