Patch "cachefiles: fix error return code in cachefiles_ondemand_copen()" has been added to the 5.19-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    cachefiles: fix error return code in cachefiles_ondemand_copen()

to the 5.19-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     cachefiles-fix-error-return-code-in-cachefiles_ondem.patch
and it can be found in the queue-5.19 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 11a0751b8641543b5ba684097ed53fc4a36f9b23
Author: Sun Ke <sunke32@xxxxxxxxxx>
Date:   Fri Aug 26 10:35:15 2022 +0800

    cachefiles: fix error return code in cachefiles_ondemand_copen()
    
    [ Upstream commit c93ccd63b18c8d108c57b2bb0e5f3b058b9d2029 ]
    
    The cache_size field of copen is specified by the user daemon.
    If cache_size < 0, then the OPEN request is expected to fail,
    while copen itself shall succeed. However, returning 0 is indeed
    unexpected when cache_size is an invalid error code.
    
    Fix this by returning error when cache_size is an invalid error code.
    
    Changes
    =======
    v4: update the code suggested by Dan
    v3: update the commit log suggested by Jingbo.
    
    Fixes: c8383054506c ("cachefiles: notify the user daemon when looking up cookie")
    Signed-off-by: Sun Ke <sunke32@xxxxxxxxxx>
    Suggested-by: Jeffle Xu <jefflexu@xxxxxxxxxxxxxxxxx>
    Suggested-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
    Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
    Reviewed-by: Gao Xiang <hsiangkao@xxxxxxxxxxxxxxxxx>
    Reviewed-by: Jingbo Xu <jefflexu@xxxxxxxxxxxxxxxxx>
    Reviewed-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20220818111935.1683062-1-sunke32@xxxxxxxxxx/ # v2
    Link: https://lore.kernel.org/r/20220818125038.2247720-1-sunke32@xxxxxxxxxx/ # v3
    Link: https://lore.kernel.org/r/20220826023515.3437469-1-sunke32@xxxxxxxxxx/ # v4
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/fs/cachefiles/ondemand.c b/fs/cachefiles/ondemand.c
index 1fee702d55293..7e1586bd5cf34 100644
--- a/fs/cachefiles/ondemand.c
+++ b/fs/cachefiles/ondemand.c
@@ -158,9 +158,13 @@ int cachefiles_ondemand_copen(struct cachefiles_cache *cache, char *args)
 
 	/* fail OPEN request if daemon reports an error */
 	if (size < 0) {
-		if (!IS_ERR_VALUE(size))
-			size = -EINVAL;
-		req->error = size;
+		if (!IS_ERR_VALUE(size)) {
+			req->error = -EINVAL;
+			ret = -EINVAL;
+		} else {
+			req->error = size;
+			ret = 0;
+		}
 		goto out;
 	}