]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
cachefiles: add missing lock protection when polling
authorJingbo Xu <jefflexu@linux.alibaba.com>
Fri, 28 Jun 2024 06:29:30 +0000 (14:29 +0800)
committerChristian Brauner <brauner@kernel.org>
Wed, 3 Jul 2024 08:36:16 +0000 (10:36 +0200)
Add missing lock protection in poll routine when iterating xarray,
otherwise:

Even with RCU read lock held, only the slot of the radix tree is
ensured to be pinned there, while the data structure (e.g. struct
cachefiles_req) stored in the slot has no such guarantee.  The poll
routine will iterate the radix tree and dereference cachefiles_req
accordingly.  Thus RCU read lock is not adequate in this case and
spinlock is needed here.

Fixes: b817e22b2e91 ("cachefiles: narrow the scope of triggering EPOLLIN events in ondemand mode")
Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>
Signed-off-by: Baokun Li <libaokun1@huawei.com>
Link: https://lore.kernel.org/r/20240628062930.2467993-10-libaokun@huaweicloud.com
Acked-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Jia Zhu <zhujia.zj@bytedance.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/cachefiles/daemon.c

index 6465e257423091d5183a6bf4c7963a2e8e900766..73ed2323282a688e686144f648014ce27933d6fb 100644 (file)
@@ -365,14 +365,14 @@ static __poll_t cachefiles_daemon_poll(struct file *file,
 
        if (cachefiles_in_ondemand_mode(cache)) {
                if (!xa_empty(&cache->reqs)) {
-                       rcu_read_lock();
+                       xas_lock(&xas);
                        xas_for_each_marked(&xas, req, ULONG_MAX, CACHEFILES_REQ_NEW) {
                                if (!cachefiles_ondemand_is_reopening_read(req)) {
                                        mask |= EPOLLIN;
                                        break;
                                }
                        }
-                       rcu_read_unlock();
+                       xas_unlock(&xas);
                }
        } else {
                if (test_bit(CACHEFILES_STATE_CHANGED, &cache->flags))