From: Sun Ke <sunke32@huawei.com>
To: <dhowells@redhat.com>
Cc: <linux-cachefs@redhat.com>, <linux-kernel@vger.kernel.org>,
<kernel-janitors@vger.kernel.org>,
<linux-fsdevel@vger.kernel.org>, <jefflexu@linux.alibaba.com>,
<dan.carpenter@oracle.com>, <hsiangkao@linux.alibaba.com>,
<sunke32@huawei.com>
Subject: [PATCH v4] cachefiles: fix error return code in cachefiles_ondemand_copen()
Date: Fri, 26 Aug 2022 10:35:15 +0800 [thread overview]
Message-ID: <20220826023515.3437469-1-sunke32@huawei.com> (raw)
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.
Fixes: c8383054506c ("cachefiles: notify the user daemon when looking up cookie")
Signed-off-by: Sun Ke <sunke32@huawei.com>
Suggested-by: Jeffle Xu <jefflexu@linux.alibaba.com>
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v4: update the code suggested by Dan
v3: update the commit log suggested by Jingbo.
fs/cachefiles/ondemand.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/fs/cachefiles/ondemand.c b/fs/cachefiles/ondemand.c
index 1fee702d5529..7e1586bd5cf3 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;
}
--
2.31.1
next reply other threads:[~2022-08-26 2:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-26 2:35 Sun Ke [this message]
2022-08-26 3:33 ` Gao Xiang
2022-08-26 4:37 ` Dan Carpenter
2022-08-26 11:31 ` JeffleXu
2022-08-31 13:52 ` David Howells
2022-08-31 14:48 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220826023515.3437469-1-sunke32@huawei.com \
--to=sunke32@huawei.com \
--cc=dan.carpenter@oracle.com \
--cc=dhowells@redhat.com \
--cc=hsiangkao@linux.alibaba.com \
--cc=jefflexu@linux.alibaba.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-cachefs@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®