From: libaokun@huaweicloud.com
To: netfs@lists.linux.dev, dhowells@redhat.com, jlayton@kernel.org
Cc: hsiangkao@linux.alibaba.com, jefflexu@linux.alibaba.com,
zhujia.zj@bytedance.com, linux-erofs@lists.ozlabs.org,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
libaokun@huaweicloud.com, yangerkun@huawei.com,
houtao1@huawei.com, yukuai3@huawei.com, wozizhi@huawei.com,
Baokun Li <libaokun1@huawei.com>
Subject: [PATCH v3 02/12] cachefiles: remove requests from xarray during flushing requests
Date: Wed, 22 May 2024 19:42:58 +0800 [thread overview]
Message-ID: <20240522114308.2402121-3-libaokun@huaweicloud.com> (raw)
In-Reply-To: <20240522114308.2402121-1-libaokun@huaweicloud.com>
From: Baokun Li <libaokun1@huawei.com>
Even with CACHEFILES_DEAD set, we can still read the requests, so in the
following concurrency the request may be used after it has been freed:
mount | daemon_thread1 | daemon_thread2
------------------------------------------------------------
cachefiles_ondemand_init_object
cachefiles_ondemand_send_req
REQ_A = kzalloc(sizeof(*req) + data_len)
wait_for_completion(&REQ_A->done)
cachefiles_daemon_read
cachefiles_ondemand_daemon_read
// close dev fd
cachefiles_flush_reqs
complete(&REQ_A->done)
kfree(REQ_A)
xa_lock(&cache->reqs);
cachefiles_ondemand_select_req
req->msg.opcode != CACHEFILES_OP_READ
// req use-after-free !!!
xa_unlock(&cache->reqs);
xa_destroy(&cache->reqs)
Hence remove requests from cache->reqs when flushing them to avoid
accessing freed requests.
Fixes: c8383054506c ("cachefiles: notify the user daemon when looking up cookie")
Signed-off-by: Baokun Li <libaokun1@huawei.com>
Acked-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Jia Zhu <zhujia.zj@bytedance.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Reviewed-by: Jingbo Xu <jefflexu@linux.alibaba.com>
---
fs/cachefiles/daemon.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
index 6465e2574230..ccb7b707ea4b 100644
--- a/fs/cachefiles/daemon.c
+++ b/fs/cachefiles/daemon.c
@@ -159,6 +159,7 @@ static void cachefiles_flush_reqs(struct cachefiles_cache *cache)
xa_for_each(xa, index, req) {
req->error = -EIO;
complete(&req->done);
+ __xa_erase(xa, index);
}
xa_unlock(xa);
--
2.39.2
next prev parent reply other threads:[~2024-05-22 3:50 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-22 11:42 [PATCH v3 00/12] cachefiles: some bugfixes and cleanups for ondemand requests libaokun
2024-05-22 11:42 ` [PATCH v3 01/12] cachefiles: add output string to cachefiles_obj_[get|put]_ondemand_fd libaokun
2024-05-22 11:42 ` libaokun [this message]
2024-05-22 11:42 ` [PATCH v3 03/12] cachefiles: fix slab-use-after-free in cachefiles_ondemand_get_fd() libaokun
2024-05-23 14:15 ` Jingbo Xu
2024-05-22 11:43 ` [PATCH v3 04/12] cachefiles: fix slab-use-after-free in cachefiles_ondemand_daemon_read() libaokun
2024-05-22 11:43 ` [PATCH v3 05/12] cachefiles: remove err_put_fd label " libaokun
2024-05-23 14:21 ` Jingbo Xu
2024-05-22 11:43 ` [PATCH v3 06/12] cachefiles: add consistency check for copen/cread libaokun
2024-05-23 14:28 ` Jingbo Xu
2024-05-24 2:28 ` Baokun Li
2024-05-27 13:33 ` Jingbo Xu
2024-05-22 11:43 ` [PATCH v3 07/12] cachefiles: add spin_lock for cachefiles_ondemand_info libaokun
2024-05-22 11:43 ` [PATCH v3 08/12] cachefiles: never get a new anonymous fd if ondemand_id is valid libaokun
2024-05-22 11:43 ` [PATCH v3 09/12] cachefiles: defer exposing anon_fd until after copy_to_user() succeeds libaokun
2024-05-22 11:43 ` [PATCH v3 10/12] cachefiles: Set object to close if ondemand_id < 0 in copen libaokun
2024-05-22 11:43 ` [PATCH v3 11/12] cachefiles: flush all requests after setting CACHEFILES_DEAD libaokun
2024-05-22 11:43 ` [PATCH v3 12/12] cachefiles: make on-demand read killable libaokun
2024-05-29 11:07 ` [PATCH v3 00/12] cachefiles: some bugfixes and cleanups for ondemand requests Christian Brauner
2024-05-29 11:23 ` Baokun Li
2024-05-29 14:28 ` Gao Xiang
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=20240522114308.2402121-3-libaokun@huaweicloud.com \
--to=libaokun@huaweicloud.com \
--cc=dhowells@redhat.com \
--cc=houtao1@huawei.com \
--cc=hsiangkao@linux.alibaba.com \
--cc=jefflexu@linux.alibaba.com \
--cc=jlayton@kernel.org \
--cc=libaokun1@huawei.com \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netfs@lists.linux.dev \
--cc=wozizhi@huawei.com \
--cc=yangerkun@huawei.com \
--cc=yukuai3@huawei.com \
--cc=zhujia.zj@bytedance.com \
/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;
as well as URLs for NNTP newsgroup(s).