Skip to content

Commit de3e26f

Browse files
LiBaokun96brauner
authored andcommitted
cachefiles: fix slab-use-after-free in cachefiles_ondemand_get_fd()
We got the following issue in a fuzz test of randomly issuing the restore command: ================================================================== BUG: KASAN: slab-use-after-free in cachefiles_ondemand_daemon_read+0x609/0xab0 Write of size 4 at addr ffff888109164a80 by task ondemand-04-dae/4962 CPU: 11 PID: 4962 Comm: ondemand-04-dae Not tainted 6.8.0-rc7-dirty #542 Call Trace: kasan_report+0x94/0xc0 cachefiles_ondemand_daemon_read+0x609/0xab0 vfs_read+0x169/0xb50 ksys_read+0xf5/0x1e0 Allocated by task 626: __kmalloc+0x1df/0x4b0 cachefiles_ondemand_send_req+0x24d/0x690 cachefiles_create_tmpfile+0x249/0xb30 cachefiles_create_file+0x6f/0x140 cachefiles_look_up_object+0x29c/0xa60 cachefiles_lookup_cookie+0x37d/0xca0 fscache_cookie_state_machine+0x43c/0x1230 [...] Freed by task 626: kfree+0xf1/0x2c0 cachefiles_ondemand_send_req+0x568/0x690 cachefiles_create_tmpfile+0x249/0xb30 cachefiles_create_file+0x6f/0x140 cachefiles_look_up_object+0x29c/0xa60 cachefiles_lookup_cookie+0x37d/0xca0 fscache_cookie_state_machine+0x43c/0x1230 [...] ================================================================== Following is the process that triggers the issue: 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 REQ_A = cachefiles_ondemand_select_req cachefiles_ondemand_get_fd copy_to_user(_buffer, msg, n) process_open_req(REQ_A) ------ restore ------ cachefiles_ondemand_restore xas_for_each(&xas, req, ULONG_MAX) xas_set_mark(&xas, CACHEFILES_REQ_NEW); cachefiles_daemon_read cachefiles_ondemand_daemon_read REQ_A = cachefiles_ondemand_select_req write(devfd, ("copen %u,%llu", msg->msg_id, size)); cachefiles_ondemand_copen xa_erase(&cache->reqs, id) complete(&REQ_A->done) kfree(REQ_A) cachefiles_ondemand_get_fd(REQ_A) fd = get_unused_fd_flags file = anon_inode_getfile fd_install(fd, file) load = (void *)REQ_A->msg.data; load->fd = fd; // load UAF !!! This issue is caused by issuing a restore command when the daemon is still alive, which results in a request being processed multiple times thus triggering a UAF. So to avoid this problem, add an additional reference count to cachefiles_req, which is held while waiting and reading, and then released when the waiting and reading is over. Note that since there is only one reference count for waiting, we need to avoid the same request being completed multiple times, so we can only complete the request if it is successfully removed from the xarray. Fixes: e73fa11 ("cachefiles: add restore command to recover inflight ondemand read requests") Suggested-by: Hou Tao <[email protected]> Signed-off-by: Baokun Li <[email protected]> Link: https://lore.kernel.org/r/[email protected] Acked-by: Jeff Layton <[email protected]> Reviewed-by: Jia Zhu <[email protected]> Reviewed-by: Jingbo Xu <[email protected]> Signed-off-by: Christian Brauner <[email protected]>
1 parent 0fc75c5 commit de3e26f

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

fs/cachefiles/internal.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ static inline bool cachefiles_in_ondemand_mode(struct cachefiles_cache *cache)
138138
struct cachefiles_req {
139139
struct cachefiles_object *object;
140140
struct completion done;
141+
refcount_t ref;
141142
int error;
142143
struct cachefiles_msg msg;
143144
};

fs/cachefiles/ondemand.c

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
#include <linux/uio.h>
55
#include "internal.h"
66

7+
static inline void cachefiles_req_put(struct cachefiles_req *req)
8+
{
9+
if (refcount_dec_and_test(&req->ref))
10+
kfree(req);
11+
}
12+
713
static int cachefiles_ondemand_fd_release(struct inode *inode,
814
struct file *file)
915
{
@@ -330,6 +336,7 @@ ssize_t cachefiles_ondemand_daemon_read(struct cachefiles_cache *cache,
330336

331337
xas_clear_mark(&xas, CACHEFILES_REQ_NEW);
332338
cache->req_id_next = xas.xa_index + 1;
339+
refcount_inc(&req->ref);
333340
xa_unlock(&cache->reqs);
334341

335342
id = xas.xa_index;
@@ -356,15 +363,22 @@ ssize_t cachefiles_ondemand_daemon_read(struct cachefiles_cache *cache,
356363
complete(&req->done);
357364
}
358365

366+
cachefiles_req_put(req);
359367
return n;
360368

361369
err_put_fd:
362370
if (msg->opcode == CACHEFILES_OP_OPEN)
363371
close_fd(((struct cachefiles_open *)msg->data)->fd);
364372
error:
365-
xa_erase(&cache->reqs, id);
366-
req->error = ret;
367-
complete(&req->done);
373+
xas_reset(&xas);
374+
xas_lock(&xas);
375+
if (xas_load(&xas) == req) {
376+
req->error = ret;
377+
complete(&req->done);
378+
xas_store(&xas, NULL);
379+
}
380+
xas_unlock(&xas);
381+
cachefiles_req_put(req);
368382
return ret;
369383
}
370384

@@ -395,6 +409,7 @@ static int cachefiles_ondemand_send_req(struct cachefiles_object *object,
395409
goto out;
396410
}
397411

412+
refcount_set(&req->ref, 1);
398413
req->object = object;
399414
init_completion(&req->done);
400415
req->msg.opcode = opcode;
@@ -456,7 +471,7 @@ static int cachefiles_ondemand_send_req(struct cachefiles_object *object,
456471
wake_up_all(&cache->daemon_pollwq);
457472
wait_for_completion(&req->done);
458473
ret = req->error;
459-
kfree(req);
474+
cachefiles_req_put(req);
460475
return ret;
461476
out:
462477
/* Reset the object to close state in error handling path.

0 commit comments

Comments
 (0)