FAILED: patch "[PATCH] fuse: copy request headers via a stack buffer for io-uring" failed to apply to 7.2-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 7.2-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-7.2.y
git checkout FETCH_HEAD
git cherry-pick -x fd10f40af314f07b6d6e028b1ca25c8b49903aab
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026083141-juicy-elated-cee2@gregkh' --subject-prefix 'PATCH 7.2.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From fd10f40af314f07b6d6e028b1ca25c8b49903aab Mon Sep 17 00:00:00 2001
From: Xiang Mei <[email protected]>
Date: Mon, 27 Jul 2026 16:37:04 -0700
Subject: [PATCH] fuse: copy request headers via a stack buffer for io-uring
The fuse-io-uring transport copies req->in.h out to the ring in fuse_uring_copy_to_ring() and req->out.h back in fuse_uring_commit(). Both headers live inside the fuse_request slab object, whose cache (fuse_req_cachep) is created without a usercopy whitelist, so copying them directly to/from userspace trips CONFIG_HARDENED_USERCOPY and panics:
usercopy: Kernel memory exposure attempt detected from SLUB object 'fuse_request' (offset 56, size 40)!
kernel BUG at mm/usercopy.c:102!
Oops: invalid opcode: 0000 [#1] SMP KASAN NOPTI RIP: 0010:usercopy_abort (mm/usercopy.c:90) Call Trace: __check_heap_object (mm/slub.c:8268) __check_object_size (mm/usercopy.c:197 mm/usercopy.c:258 mm/usercopy.c:223) copy_header_to_ring (fs/fuse/dev_uring.c:618) fuse_uring_prepare_send (fs/fuse/dev_uring.c:776 fs/fuse/dev_uring.c:785) fuse_uring_send_in_task (fs/fuse/dev_uring.c:1306) tctx_task_work_run (io_uring/tw.c:96) task_work_run (kernel/task_work.c:233) io_run_task_work (io_uring/tw.h:84) io_cqring_wait (io_uring/wait.c:278) __do_sys_io_uring_enter (io_uring/io_uring.c:2685) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:121)
Bounce both headers through an on-stack copy so the usercopy touches stack memory, not the slab object.
fs/fuse/dev_uring.c +8 -4
@@ -922,6 +922,7 @@ static int fuse_uring_copy_to_ring(struct fuse_ring_ent *ent, unsigned int issue_flags) {struct fuse_ring_queue *queue = ent->queue; +struct fuse_in_header in_header;int err; err = -EIO ;
@@ -943,8 +944,9 @@ static int fuse_uring_copy_to_ring(struct fuse_ring_ent *ent, }/* copy fuse_in_header */ -return copy_header_to_ring (ent,FUSE_URING_HEADER_IN_OUT , &req->in.h, -sizeof (req->in.h)); + in_header = req->in.h; +return copy_header_to_ring (ent,FUSE_URING_HEADER_IN_OUT , &in_header, +sizeof (in_header)); } static bool fuse_uring_req_has_copyable_payload(struct fuse_ring_ent *ent,
@@ -1151,11 +1153,13 @@ static struct fuse_req *fuse_uring_ent_assign_req(struct fuse_ring_ent *ent)static void fuse_uring_commit (struct fuse_ring_ent *ent,struct fuse_req *req,unsigned int issue_flags) { +struct fuse_out_header out_header;ssize_t err = -EFAULT ; -if (copy_header_from_ring (ent,FUSE_URING_HEADER_IN_OUT , &req->out.h, -sizeof (req->out.h))) +if (copy_header_from_ring (ent,FUSE_URING_HEADER_IN_OUT , &out_header, +sizeof (out_header))) goto out; + req->out.h = out_header; err =fuse_uring_out_header_has_err (&req->out.h, req);if (err) {
Sasha Levin
maintainerPATCH 1/2 fuse: decouple fuse_ring creation from ent registration
From: Joanne Koong <[email protected]>
[ Upstream commit 6330b1f61ed1d17850fc61bdb8920ca1056e2cf9 ]
Currently, the connection's fuse_ring is created lazily on the first FUSE_IO_URING_CMD_REGISTER command. A server registers entries from one thread per queue (one per CPU) and those threads issue their first REGISTER command concurrently. They then race to create the single per-connection fuse_ring, which required open-coded handling in fuse_uring_create() to detect and protect against concurrent creations.
Decouple fuse_ring creation from ent registration and move it to FUSE_INIT reply processing after a server has negotiated and set FUSE_OVER_IO_URING. The ring is published before the connection is marked initialized. fuse_uring_register() no longer creates the ring and it instead uses the ring set up at init time.
Stable-dep-of: fd10f40af314 ("fuse: copy request headers via a stack buffer for io-uring")
--- fs/fuse/dev.c | 8 +++----- fs/fuse/dev.h | 2 +- fs/fuse/dev_uring.c | 26 ++++++++++---------------- fs/fuse/dev_uring_i.h | 5 +++++ fs/fuse/inode.c | 4 +++- 5 files changed, 22 insertions(+), 23 deletions(-)
fs/fuse/dev.c +3 -5
@@ -75,6 +75,9 @@ void fuse_chan_set_initialized(struct fuse_chan *fch, struct fuse_chan_param *pa fch->minor = param->minor; fch->max_write = param->max_write; fch->max_pages = param->max_pages; + +if (param->io_uring_enabled) +fuse_uring_conn_init (fch); }/* Make sure stores before this are seen on another CPU */
@@ -411,11 +414,6 @@ void fuse_chan_set_fc(struct fuse_chan *fch, struct fuse_conn *fc) fch->conn = fc; } -void fuse_chan_io_uring_enable (struct fuse_chan *fch) -{ - fch->io_uring =1 ; -} -void fuse_pqueue_init (struct fuse_pqueue *fpq) {spin_lock_init (&fpq->lock);
fs/fuse/dev.h +1 -1
@@ -22,6 +22,7 @@ struct fuse_chan_param {unsigned int minor;unsigned int max_write;unsigned int max_pages; +bool io_uring_enabled; };struct fuse_chan *fuse_chan_new (void );
@@ -34,7 +35,6 @@ void fuse_chan_max_background_set(struct fuse_chan *fch, unsigned int val);unsigned int fuse_chan_num_waiting (struct fuse_chan *fch);void fuse_chan_set_fc (struct fuse_chan *fch,struct fuse_conn *fc);void fuse_chan_set_initialized (struct fuse_chan *fch,struct fuse_chan_param *param); -void fuse_chan_io_uring_enable (struct fuse_chan *fch);ssize_t fuse_chan_send (struct fuse_chan *fch,struct fuse_args *args);int fuse_chan_send_bg (struct fuse_chan *fch,struct fuse_args *args,gfp_t gfp_flags);int fuse_chan_send_notify_reply (struct fuse_chan *fch,struct fuse_args *args,u64 unique);
fs/fuse/dev_uring.c +10 -16
@@ -238,7 +238,6 @@ static struct fuse_ring *fuse_uring_create(struct fuse_chan *fch) {struct fuse_ring *ring;size_t nr_queues =num_possible_cpus (); -struct fuse_ring *res =NULL ;size_t max_payload_size; ring =kzalloc_obj (*ring,GFP_KERNEL_ACCOUNT );
@@ -258,12 +257,6 @@ static struct fuse_ring *fuse_uring_create(struct fuse_chan *fch)spin_unlock (&fch->lock); goto out_err; } -if (fch->ring) { -/* race, another thread created the ring in the meantime */ -spin_unlock (&fch->lock); - res = fch->ring; - goto out_err; - }init_waitqueue_head (&ring->stop_waitq);
@@ -278,7 +271,13 @@ static struct fuse_ring *fuse_uring_create(struct fuse_chan *fch) out_err:kfree (ring->queues);kfree (ring); -return res; +return NULL ; +} + +void fuse_uring_conn_init (struct fuse_chan *fch) +{ +if (fuse_uring_create (fch)) + fch->io_uring =1 ; } static struct fuse_ring_queue *fuse_uring_create_queue(struct fuse_ring *ring,
@@ -1176,15 +1175,10 @@ static int fuse_uring_register(struct io_uring_cmd *cmd,struct fuse_ring *ring =smp_load_acquire (&fch->ring);struct fuse_ring_queue *queue;struct fuse_ring_ent *ent; -int err;unsigned int qid =READ_ONCE (cmd_req->qid); - err = -ENOMEM ; -if (!ring) { - ring =fuse_uring_create (fch); -if (!ring) -return err; - } +if (!ring) +return -EINVAL ;if (qid >= ring->nr_queues) {pr_info_ratelimited ("fuse: Invalid ring qid %u\n" , qid);
@@ -1195,7 +1189,7 @@ static int fuse_uring_register(struct io_uring_cmd *cmd,if (!queue) { queue =fuse_uring_create_queue (ring, qid);if (!queue) -return err; +return -ENOMEM ; }/*
fs/fuse/dev_uring_i.h +5 -0
@@ -135,6 +135,7 @@ struct fuse_ring {bool ready; }; +void fuse_uring_conn_init (struct fuse_chan *fch);void fuse_uring_stop_queues (struct fuse_ring *ring);void fuse_uring_abort_end_requests (struct fuse_ring *ring);int fuse_uring_cmd (struct io_uring_cmd *cmd,unsigned int issue_flags);
@@ -174,6 +175,10 @@ static inline bool fuse_uring_ready(struct fuse_chan *fch)#else /* CONFIG_FUSE_IO_URING */ +static inline void fuse_uring_conn_init (struct fuse_chan *fch) +{ +} +static inline void fuse_uring_abort (struct fuse_chan *fch) { }
fs/fuse/inode.c +3 -1
@@ -1272,6 +1272,7 @@ static void process_init_reply(struct fuse_args *args, int error)struct fuse_mount *fm = ia->fm;struct fuse_conn *fc = fm->fc;struct fuse_init_out *arg = &ia->out; +bool io_uring_enabled = false;bool ok = true;if (error || arg->major !=FUSE_KERNEL_VERSION )
@@ -1402,7 +1403,7 @@ static void process_init_reply(struct fuse_args *args, int error) ok = false; }if (flags &FUSE_OVER_IO_URING &&fuse_uring_enabled ()) -fuse_chan_io_uring_enable (fc->chan); + io_uring_enabled = true;if (flags &FUSE_REQUEST_TIMEOUT ) timeout = arg->request_timeout;
@@ -1432,6 +1433,7 @@ static void process_init_reply(struct fuse_args *args, int error) .minor = fc->minor, .max_write = fc->max_write, .max_pages = fc->max_pages, + .io_uring_enabled = io_uring_enabled, };fuse_chan_set_initialized (fc->chan, &cp); }
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 fuse: copy request headers via a stack buffer for io-uring
From: Xiang Mei <[email protected]>
[ Upstream commit fd10f40af314f07b6d6e028b1ca25c8b49903aab ]
The fuse-io-uring transport copies req->in.h out to the ring in fuse_uring_copy_to_ring() and req->out.h back in fuse_uring_commit(). Both headers live inside the fuse_request slab object, whose cache (fuse_req_cachep) is created without a usercopy whitelist, so copying them directly to/from userspace trips CONFIG_HARDENED_USERCOPY and panics:
usercopy: Kernel memory exposure attempt detected from SLUB object 'fuse_request' (offset 56, size 40)!
kernel BUG at mm/usercopy.c:102!
Oops: invalid opcode: 0000 [#1] SMP KASAN NOPTI RIP: 0010:usercopy_abort (mm/usercopy.c:90) Call Trace: __check_heap_object (mm/slub.c:8268) __check_object_size (mm/usercopy.c:197 mm/usercopy.c:258 mm/usercopy.c:223) copy_header_to_ring (fs/fuse/dev_uring.c:618) fuse_uring_prepare_send (fs/fuse/dev_uring.c:776 fs/fuse/dev_uring.c:785) fuse_uring_send_in_task (fs/fuse/dev_uring.c:1306) tctx_task_work_run (io_uring/tw.c:96) task_work_run (kernel/task_work.c:233) io_run_task_work (io_uring/tw.h:84) io_cqring_wait (io_uring/wait.c:278) __do_sys_io_uring_enter (io_uring/io_uring.c:2685) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:121)
Bounce both headers through an on-stack copy so the usercopy touches stack memory, not the slab object.
--- fs/fuse/dev_uring.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
fs/fuse/dev_uring.c +8 -4
@@ -743,6 +743,7 @@ static int fuse_uring_copy_to_ring(struct fuse_ring_ent *ent, {struct fuse_ring_queue *queue = ent->queue;struct fuse_ring *ring = queue->ring; +struct fuse_in_header in_header;int err; err = -EIO ;
@@ -764,8 +765,9 @@ static int fuse_uring_copy_to_ring(struct fuse_ring_ent *ent, }/* copy fuse_in_header */ -return copy_header_to_ring (ent,FUSE_URING_HEADER_IN_OUT , &req->in.h, -sizeof (req->in.h)); + in_header = req->in.h; +return copy_header_to_ring (ent,FUSE_URING_HEADER_IN_OUT , &in_header, +sizeof (in_header)); } static int fuse_uring_prepare_send(struct fuse_ring_ent *ent,
@@ -870,11 +872,13 @@ static void fuse_uring_commit(struct fuse_ring_ent *ent, struct fuse_req *req, unsigned int issue_flags) {struct fuse_ring *ring = ent->queue->ring; +struct fuse_out_header out_header;ssize_t err = -EFAULT ; -if (copy_header_from_ring (ent,FUSE_URING_HEADER_IN_OUT , &req->out.h, -sizeof (req->out.h))) +if (copy_header_from_ring (ent,FUSE_URING_HEADER_IN_OUT , &out_header, +sizeof (out_header))) goto out; + req->out.h = out_header; err =fuse_uring_out_header_has_err (&req->out.h, req);if (err) {
Signature · 1 line
2.53.0