Skip to content

Commit 85e833c

Browse files
LiBaokun96brauner
authored andcommitted
cachefiles: flush all requests after setting CACHEFILES_DEAD
In ondemand mode, when the daemon is processing an open request, if the kernel flags the cache as CACHEFILES_DEAD, the cachefiles_daemon_write() will always return -EIO, so the daemon can't pass the copen to the kernel. Then the kernel process that is waiting for the copen triggers a hung_task. Since the DEAD state is irreversible, it can only be exited by closing /dev/cachefiles. Therefore, after calling cachefiles_io_error() to mark the cache as CACHEFILES_DEAD, if in ondemand mode, flush all requests to avoid the above hungtask. We may still be able to read some of the cached data before closing the fd of /dev/cachefiles. Note that this relies on the patch that adds reference counting to the req, otherwise it may UAF. Fixes: c838305 ("cachefiles: notify the user daemon when looking up cookie") Signed-off-by: Baokun Li <[email protected]> Link: https://lore.kernel.org/r/[email protected] Acked-by: Jeff Layton <[email protected]> Signed-off-by: Christian Brauner <[email protected]>
1 parent 4f8703f commit 85e833c

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

fs/cachefiles/daemon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ static int cachefiles_daemon_open(struct inode *inode, struct file *file)
133133
return 0;
134134
}
135135

136-
static void cachefiles_flush_reqs(struct cachefiles_cache *cache)
136+
void cachefiles_flush_reqs(struct cachefiles_cache *cache)
137137
{
138138
struct xarray *xa = &cache->reqs;
139139
struct cachefiles_req *req;

fs/cachefiles/internal.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ extern int cachefiles_has_space(struct cachefiles_cache *cache,
188188
* daemon.c
189189
*/
190190
extern const struct file_operations cachefiles_daemon_fops;
191+
extern void cachefiles_flush_reqs(struct cachefiles_cache *cache);
191192
extern void cachefiles_get_unbind_pincount(struct cachefiles_cache *cache);
192193
extern void cachefiles_put_unbind_pincount(struct cachefiles_cache *cache);
193194

@@ -426,6 +427,8 @@ do { \
426427
pr_err("I/O Error: " FMT"\n", ##__VA_ARGS__); \
427428
fscache_io_error((___cache)->cache); \
428429
set_bit(CACHEFILES_DEAD, &(___cache)->flags); \
430+
if (cachefiles_in_ondemand_mode(___cache)) \
431+
cachefiles_flush_reqs(___cache); \
429432
} while (0)
430433

431434
#define cachefiles_io_error_obj(object, FMT, ...) \

0 commit comments

Comments
 (0)