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: <f555b324b79829d6fc63da0d05995ce337969f65.camel@kernel.org>
Date: Mon, 15 Apr 2024 08:40:21 -0400
From: Jeff Layton <jlayton@...nel.org>
To: David Howells <dhowells@...hat.com>, Christian Brauner
	 <christian@...uner.io>, Gao Xiang <hsiangkao@...ux.alibaba.com>, Dominique
	Martinet <asmadeus@...ewreck.org>
Cc: Matthew Wilcox <willy@...radead.org>, Steve French <smfrench@...il.com>,
  Marc Dionne <marc.dionne@...istor.com>, Paulo Alcantara
 <pc@...guebit.com>, Shyam Prasad N <sprasad@...rosoft.com>, Tom Talpey
 <tom@...pey.com>, Eric Van Hensbergen <ericvh@...nel.org>, Ilya Dryomov
 <idryomov@...il.com>, netfs@...ts.linux.dev,  linux-cachefs@...hat.com,
 linux-afs@...ts.infradead.org,  linux-cifs@...r.kernel.org,
 linux-nfs@...r.kernel.org,  ceph-devel@...r.kernel.org,
 v9fs@...ts.linux.dev, linux-erofs@...ts.ozlabs.org, 
 linux-fsdevel@...r.kernel.org, linux-mm@...ck.org, netdev@...r.kernel.org, 
 linux-kernel@...r.kernel.org
Subject: Re: [PATCH 17/26] netfs: Fix writethrough-mode error handling

On Thu, 2024-03-28 at 16:34 +0000, David Howells wrote:
> Fix the error return in netfs_perform_write() acting in writethrough-mode
> to return any cached error in the case that netfs_end_writethrough()
> returns 0.
> 
> Signed-off-by: David Howells <dhowells@...hat.com>
> cc: Jeff Layton <jlayton@...nel.org>
> cc: netfs@...ts.linux.dev
> cc: linux-fsdevel@...r.kernel.org
> ---
>  fs/netfs/buffered_write.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/netfs/buffered_write.c b/fs/netfs/buffered_write.c
> index 8e4a3fb287e3..db4ad158948b 100644
> --- a/fs/netfs/buffered_write.c
> +++ b/fs/netfs/buffered_write.c
> @@ -188,7 +188,7 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter,
>  	enum netfs_how_to_modify howto;
>  	enum netfs_folio_trace trace;
>  	unsigned int bdp_flags = (iocb->ki_flags & IOCB_SYNC) ? 0: BDP_ASYNC;
> -	ssize_t written = 0, ret;
> +	ssize_t written = 0, ret, ret2;
>  	loff_t i_size, pos = iocb->ki_pos, from, to;
>  	size_t max_chunk = PAGE_SIZE << MAX_PAGECACHE_ORDER;
>  	bool maybe_trouble = false;
> @@ -409,10 +409,12 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter,
>  
>  out:
>  	if (unlikely(wreq)) {
> -		ret = netfs_end_writethrough(wreq, iocb);
> +		ret2 = netfs_end_writethrough(wreq, iocb);
>  		wbc_detach_inode(&wbc);
> -		if (ret == -EIOCBQUEUED)
> -			return ret;
> +		if (ret2 == -EIOCBQUEUED)
> +			return ret2;
> +		if (ret == 0)
> +			ret = ret2;
>  	}
>  
>  	iocb->ki_pos += written;
> 

Should this be merged independently? It looks like a bug that's present
now.

Reviewed-by: Jeff Layton <jlayton@...nel.org>

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ