Commit c93ccd63 authored by Sun Ke's avatar Sun Ke Committed by David Howells
Browse files

cachefiles: fix error return code in cachefiles_ondemand_copen() 



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: c8383054 ("cachefiles: notify the user daemon when looking up cookie")
Signed-off-by: default avatarSun Ke <sunke32@huawei.com>
Suggested-by: default avatarJeffle Xu <jefflexu@linux.alibaba.com>
Suggested-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Reviewed-by: default avatarJingbo Xu <jefflexu@linux.alibaba.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20220818111935.1683062-1-sunke32@huawei.com/ # v2
Link: https://lore.kernel.org/r/20220818125038.2247720-1-sunke32@huawei.com/ # v3
Link: https://lore.kernel.org/r/20220826023515.3437469-1-sunke32@huawei.com/ # v4
parent ec1bd371

fs/cachefiles/ondemand.c

+7 −3
Original line number Diff line number Diff line
@@ -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;

		if (!IS_ERR_VALUE(size)) {

			req->error = -EINVAL;

			ret = -EINVAL;

		} else {

			req->error = size;

			ret = 0;

		}

		goto out;

	}