[PATCH] fscache: Fix error handling in fscache_begin_operation()

[PATCH] fscache: Fix error handling in fscache_begin_operation()

[David Howells]

    
Fix fscache_begin_operation() to clear cres->cache_priv on error, otherwise
fscache_resources_valid() will report it as being valid.

Signed-off-by: David Howells <dhowells@redhat.com>
Reported-by: Marc Dionne <marc.dionne@auristor.com>
cc: Jeff Layton <jlayton@kernel.org>
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
---
 fs/netfs/fscache_io.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/netfs/fscache_io.c b/fs/netfs/fscache_io.c
index ad57e4412c6d..cfd58ad95e7c 100644
--- a/fs/netfs/fscache_io.c
+++ b/fs/netfs/fscache_io.c
@@ -83,8 +83,10 @@ static int fscache_begin_operation(struct netfs_cache_resources *cres,
 	cres->debug_id		= cookie->debug_id;
 	cres->inval_counter	= cookie->inval_counter;
 
-	if (!fscache_begin_cookie_access(cookie, why))
+	if (!fscache_begin_cookie_access(cookie, why)) {
+		cres->cache_priv = NULL;
 		return -ENOBUFS;
+	}
 
 again:
 	spin_lock(&cookie->lock);

Re: [PATCH] fscache: Fix error handling in fscache_begin_operation()

[Jeff Layton]

On Fri, 2024-03-15 at 14:48 +0000, David Howells wrote:
>     
> Fix fscache_begin_operation() to clear cres->cache_priv on error, otherwise
> fscache_resources_valid() will report it as being valid.
> 
> Signed-off-by: David Howells <dhowells@redhat.com>
> Reported-by: Marc Dionne <marc.dionne@auristor.com>
> cc: Jeff Layton <jlayton@kernel.org>
> cc: netfs@lists.linux.dev
> cc: linux-fsdevel@vger.kernel.org
> ---
>  fs/netfs/fscache_io.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/netfs/fscache_io.c b/fs/netfs/fscache_io.c
> index ad57e4412c6d..cfd58ad95e7c 100644
> --- a/fs/netfs/fscache_io.c
> +++ b/fs/netfs/fscache_io.c
> @@ -83,8 +83,10 @@ static int fscache_begin_operation(struct netfs_cache_resources *cres,
>  	cres->debug_id		= cookie->debug_id;
>  	cres->inval_counter	= cookie->inval_counter;
>  
> -	if (!fscache_begin_cookie_access(cookie, why))
> +	if (!fscache_begin_cookie_access(cookie, why)) {
> +		cres->cache_priv = NULL;
>  		return -ENOBUFS;
> +	}
>  
>  again:
>  	spin_lock(&cookie->lock);
> 
> 

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

Re: [PATCH] fscache: Fix error handling in fscache_begin_operation()

[Christian Brauner]

On Fri, 15 Mar 2024 14:48:26 +0000, David Howells wrote:
> 
> Fix fscache_begin_operation() to clear cres->cache_priv on error, otherwise
> fscache_resources_valid() will report it as being valid.
> 
> 

Applied to the vfs.fixes branch of the vfs/vfs.git tree.
Patches in the vfs.fixes branch should appear in linux-next soon.

Please report any outstanding bugs that were missed during review in a
new review to the original patch series allowing us to drop it.

It's encouraged to provide Acked-bys and Reviewed-bys even though the
patch has now been applied. If possible patch trailers will be updated.

Note that commit hashes shown below are subject to change due to rebase,
trailer updates or similar. If in doubt, please check the listed branch.

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
branch: vfs.fixes

[1/1] fscache: Fix error handling in fscache_begin_operation()
      https://git.kernel.org/vfs/vfs/c/d86f1160d819