fuse: fix kernel NULL pointer dereference in fuse_uring_add_to_pq()
Subsystems (3)
PATCH 1/1 fuse: fix kernel NULL pointer dereference in fuse_uring_add_to_pq()
A kernel NULL pointer dereference was triggered when testing the 'fuse over io_uring' feature with passthrough_ll. The call trace is as follows:
BUG: kernel NULL pointer dereference, address: 0000000000000878 RIP: 0010:fuse_uring_add_req_to_ring_ent+0x89/0xd0 [fuse] Call Trace: <TASK> fuse_uring_queue_fuse_req+0x82/0x100 [fuse] fuse_chan_send+0xe6/0x180 [fuse] fuse_lookup_name+0x131/0x2b0 [fuse] fuse_lookup+0x78/0x1a0 [fuse] fuse_atomic_open+0xfc/0x140 [fuse] atomic_open+0x4b/0xf0 path_openat+0x746/0x1080 do_file_open+0xc9/0x180
fuse_uring_create_queue() must initialize struct fuse_pqueue before assigning the per-hash processing table:
- Call fuse_pqueue_init() before setting fpq.processing. fuse_pqueue_init() clears fpq.processing; assigning the kcalloc'd bucket array must happen afterwards.
- After allocating the processing bucket array with kzalloc_objs(), initialize each list head with INIT_LIST_HEAD(), matching fuse_pqueue_alloc() in dev.c. Zeroed list_head values are not valid empty lists; list_move_tail() would dereference NULL prev/next.
--- fs/fuse/dev_uring.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/fuse/dev_uring.c +3 -1
@@ -282,6 +282,8 @@ static struct fuse_ring_queue *fuse_uring_create_queue(struct fuse_ring *ring,kfree (queue);return NULL ; } +for (int i =0 ; i <FUSE_PQ_HASH_SIZE ; i++) +INIT_LIST_HEAD (&pq[i]); queue->qid = qid; queue->ring = ring;
@@ -295,8 +297,8 @@ static struct fuse_ring_queue *fuse_uring_create_queue(struct fuse_ring *ring,INIT_LIST_HEAD (&queue->fuse_req_bg_queue);INIT_LIST_HEAD (&queue->ent_released); - queue->fpq.processing = pq;fuse_pqueue_init (&queue->fpq); + queue->fpq.processing = pq;spin_lock (&fch->lock);if (ring->queues[qid]) {
Signature · 1 line
2.34.1
Quoted 9 lines · Li Wang
A kernel NULL pointer dereference was triggered when testing the 'fuse over
io_uring' feature withpassthrough_ll. The call trace is as follows:BUG: kernel NULL pointer dereference, address: 0000000000000878 RIP: 0010:fuse_uring_add_req_to_ring_ent+0x89/0xd0 [fuse] Call Trace: <TASK> fuse_uring_queue_fuse_req+0x82/0x100 [fuse] fuse_chan_send+0xe6/0x180 [fuse]
I don't see fuse_chan_send() in upstream kernel. I think you are testing kernel with this patchset[1] applied?
[1] https://lore.kernel.org/all/[email protected]/
Signature · 2 lines
Thanks, Jingbo
Hi Jingbo,
Quoted 13 lines · Jingbo Xu
Quoted 9 lines · Li Wang
A kernel NULL pointer dereference was triggered when testing the 'fuse over
io_uring' feature withpassthrough_ll. The call trace is as follows:BUG: kernel NULL pointer dereference, address: 0000000000000878 RIP: 0010:fuse_uring_add_req_to_ring_ent+0x89/0xd0 [fuse] Call Trace: <TASK> fuse_uring_queue_fuse_req+0x82/0x100 [fuse] fuse_chan_send+0xe6/0x180 [fuse]
Quoted 5 lines
I don't see
fuse_chan_send()in upstream kernel. I think you are testing kernel with this patchset[1] applied?
The test is based ongit://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next
Thanks,
Li
Bernd Schubert
maintainerQuoted 9 lines · Li Wang
A kernel NULL pointer dereference was triggered when testing the 'fuse over
io_uring' feature withpassthrough_ll. The call trace is as follows:BUG: kernel NULL pointer dereference, address: 0000000000000878 RIP: 0010:fuse_uring_add_req_to_ring_ent+0x89/0xd0 [fuse] Call Trace: <TASK> fuse_uring_queue_fuse_req+0x82/0x100 [fuse] fuse_chan_send+0xe6/0x180 [fuse]
Is this linux-next?
Quoted 38 lines
fuse_lookup_name+0x131/0x2b0 [fuse] fuse_lookup+0x78/0x1a0 [fuse] fuse_atomic_open+0xfc/0x140 [fuse] atomic_open+0x4b/0xf0 path_openat+0x746/0x1080 do_file_open+0xc9/0x180
fuse_uring_create_queue()must initialize structfuse_pqueuebefore assigning the per-hash processing table:- Call
fuse_pqueue_init()before setting fpq.processing.fuse_pqueue_init()clears fpq.processing; assigning the kcalloc'd bucket array must happen afterwards.- After allocating the processing bucket array with
kzalloc_objs(), initialize each list head withINIT_LIST_HEAD(), matchingfuse_pqueue_alloc()indev.c. Zeroedlist_headvalues are not valid empty lists;list_move_tail()would dereference NULL prev/next.Signed-off-by Li Wang <[email protected]>--- fs/fuse/dev_uring.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)fs/fuse/dev_uring.c +2
-0@@ -282,6 +282,8 @@ static struct fuse_ring_queue *fuse_uring_create_queue(struct fuse_ring *ring,kfree (queue);return NULL ; } +for (int i =0 ; i <FUSE_PQ_HASH_SIZE ; i++) +INIT_LIST_HEAD (&pq[i]); queue->qid = qid; queue->ring = ring;
fs/fuse/dev_uring.c static struct fuse_ring_queue *fuse_uring_create_queue(struct fuse_ring *ring, · line 304
Quoted 9 lines
fs/fuse/dev_uring.c +1
-1@@ -295,8 +297,8 @@ static struct fuse_ring_queue *fuse_uring_create_queue(struct fuse_ring *ring,INIT_LIST_HEAD (&queue->fuse_req_bg_queue);INIT_LIST_HEAD (&queue->ent_released); - queue->fpq.processing = pq;fuse_pqueue_init (&queue->fpq); + queue->fpq.processing = pq;spin_lock (&fch->lock);if (ring->queues[qid]) {
I don't think this patch is right. The existing order is
queue = kzalloc_obj(*queue, GFP_KERNEL_ACCOUNT); pq = kzalloc_objs(struct list_head, FUSE_PQ_HASH_SIZE); queue->fpq.processing = pq; fuse_pqueue_init(&queue->fpq); =====> INIT_LIST_HEAD() of pg
I need to look at Miklos' patches, I guess it sends to fuse-io-uring, although that is not ready yet.
Thanks,
Bernd
Hi Bernd,
Quoted 9 lines · Bernd Schubert
I don't think this patch is right. The existing order is
queue = kzalloc_obj(*queue, GFP_KERNEL_ACCOUNT); pq = kzalloc_objs(struct list_head, FUSE_PQ_HASH_SIZE); queue->fpq.processing = pq; fuse_pqueue_init(&queue->fpq); =====> INIT_LIST_HEAD() of pg
Quoted 6 lines
I need to look at Miklos' patches, I guess it sends to fuse-io-uring, although that is not ready yet.
Thanks,
Bernd
The test is based ongit://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next
It seems the code ordering has been changed.
Thanks,
Li
Joanne Koong
maintainerQuoted 58 lines · Li Wang
A kernel NULL pointer dereference was triggered when testing the 'fuse over
io_uring' feature withpassthrough_ll. The call trace is as follows:BUG: kernel NULL pointer dereference, address: 0000000000000878 RIP: 0010:fuse_uring_add_req_to_ring_ent+0x89/0xd0 [fuse] Call Trace: <TASK> fuse_uring_queue_fuse_req+0x82/0x100 [fuse] fuse_chan_send+0xe6/0x180 [fuse] fuse_lookup_name+0x131/0x2b0 [fuse] fuse_lookup+0x78/0x1a0 [fuse] fuse_atomic_open+0xfc/0x140 [fuse] atomic_open+0x4b/0xf0 path_openat+0x746/0x1080 do_file_open+0xc9/0x180
fuse_uring_create_queue()must initialize structfuse_pqueuebefore assigning the per-hash processing table:- Call
fuse_pqueue_init()before setting fpq.processing.fuse_pqueue_init()clears fpq.processing; assigning the kcalloc'd bucket array must happen afterwards.- After allocating the processing bucket array with
kzalloc_objs(), initialize each list head withINIT_LIST_HEAD(), matchingfuse_pqueue_alloc()indev.c. Zeroedlist_headvalues are not valid empty lists;list_move_tail()would dereference NULL prev/next.Signed-off-by Li Wang <[email protected]>--- fs/fuse/dev_uring.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)fs/fuse/dev_uring.c +3
-2@@ -282,6 +282,8 @@ static struct fuse_ring_queue *fuse_uring_create_queue(struct fuse_ring *ring,kfree (queue);return NULL ; } +for (int i =0 ; i <FUSE_PQ_HASH_SIZE ; i++) +INIT_LIST_HEAD (&pq[i]); queue->qid = qid; queue->ring = ring;@@ -295,8 +297,8 @@ static struct fuse_ring_queue *fuse_uring_create_queue(struct fuse_ring *ring,INIT_LIST_HEAD (&queue->fuse_req_bg_queue);INIT_LIST_HEAD (&queue->ent_released); - queue->fpq.processing = pq;fuse_pqueue_init (&queue->fpq); + queue->fpq.processing = pq;spin_lock (&fch->lock);if (ring->queues[qid]) { --
Quoted 2 lines
2.34.1
Thanks for testing/reporting this! This lgtm but afaict, the patches in that patchset aren't finalized yet so imo it'd be cleaner if this gets folded into the original patch [1] instead of being its own separate commit.
I think using fuse_pqueue_alloc() ends up being a tad bit cleaner, eg
fs/fuse/dev_uring.c +0 -0
@@ -277,7 +277,7 @@ static struct fuse_ring_queue
*fuse_uring_create_queue(struct fuse_ring *ring,
queue = kzalloc_obj(*queue, GFP_KERNEL_ACCOUNT);
if (!queue)
return NULL;
- pq = kzalloc_objs(struct list_head, FUSE_PQ_HASH_SIZE);
+ pq = fuse_pqueue_alloc();
if (!pq) {
kfree(queue);
return NULL;
@@ -295,8 +295,8 @@ static struct fuse_ring_queue
*fuse_uring_create_queue(struct fuse_ring *ring,
INIT_LIST_HEAD(&queue->fuse_req_bg_queue);
INIT_LIST_HEAD(&queue->ent_released);- queue->fpq.processing = pq;
fuse_pqueue_init(&queue->fpq);+ queue->fpq.processing = pq;
after exporting fuse_pqueue_alloc() into fuse_dev_i.h
Thanks,
Joanne
Hi Joanne,
Quoted 8 lines · Joanne Koong
Thanks for testing/reporting this! This lgtm but afaict, the patches in that patchset aren't finalized yet so imo it'd be cleaner if this gets folded into the original patch [1] instead of being its own separate commit.
I think using
fuse_pqueue_alloc()ends up being a tad bit cleaner
Thanks for the feedback. I'm fine with either way (fold or split), and I will follow your suggestions and send out a v2.
Thanks,
Li
Quoted 29 lines
fs/fuse/dev_uring.c +1
-1@@ -277,7 +277,7 @@ static struct fuse_ring_queue *fuse_uring_create_queue(struct fuse_ring *ring, queue = kzalloc_obj(*queue, GFP_KERNEL_ACCOUNT);if (!queue)return NULL ; - pq = kzalloc_objs(struct list_head, FUSE_PQ_HASH_SIZE); + pq =fuse_pqueue_alloc ();if (!pq) {kfree (queue);return NULL;fs/fuse/dev_uring.c +1
-1@@ -295,8 +295,8 @@ static struct fuse_ring_queue *fuse_uring_create_queue(struct fuse_ring *ring, INIT_LIST_HEAD(&queue->fuse_req_bg_queue);INIT_LIST_HEAD (&queue->ent_released); - queue->fpq.processing = pq;fuse_pqueue_init (&queue->fpq); + queue->fpq.processing = pq;after exporting
fuse_pqueue_alloc()intofuse_dev_i.hThanks,
Joanne
Miklos Szeredi
maintainerQuoted 19 lines · Li Wang
Quoted 19 lines
fs/fuse/dev_uring.c +1
-1@@ -277,7 +277,7 @@ static struct fuse_ring_queue *fuse_uring_create_queue(struct fuse_ring *ring, queue = kzalloc_obj(*queue, GFP_KERNEL_ACCOUNT);if (!queue)return NULL ; - pq = kzalloc_objs(struct list_head, FUSE_PQ_HASH_SIZE); + pq =fuse_pqueue_alloc ();if (!pq) {kfree (queue);return NULL;fs/fuse/dev_uring.c +0
-0@@ -295,8 +295,8 @@ static struct fuse_ring_queue *fuse_uring_create_queue(struct fuse_ring *ring, INIT_LIST_HEAD(&queue->fuse_req_bg_queue);INIT_LIST_HEAD (&queue->ent_released);
Quoted 5 lines
Quoted 5 lines
fs/fuse/dev_uring.c +1
-1- queue->fpq.processing = pq;fuse_pqueue_init (&queue->fpq); + queue->fpq.processing = pq;after exporting
fuse_pqueue_alloc()intofuse_dev_i.h
Folded.
Thanks,
Miklos