6.1-stable fix

6.1-stable fix

[Jens Axboe]

[-- Attachment #1: Type: text/plain, Size: 184 bytes --]

Hi,

Ran into an issue testing 6.1, which I discovered was introduced by
a backport that was done. Here's the fix for it, please add it to
the 6.1-stable mix. Thanks!

-- 
Jens Axboe


[-- Attachment #2: 0001-io_uring-filetable-ensure-node-switch-is-always-done.patch --]
[-- Type: text/x-patch, Size: 1300 bytes --]

From 5a0743d2fd97f0b73b78305a9a155a164d8ce4f5 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 3 Apr 2025 10:48:49 -0600
Subject: [PATCH] io_uring/filetable: ensure node switch is always done, if
 needed

No upstream patch exists for this issue, as it was introduced by
a stable backport.

A previous backport relied on other code changes in the io_uring file
table and resource node handling, which means that sometimes a resource
node switch can get missed. For 6.1-stable, that code is still in
io_install_fixed_file(), so ensure we fall-through to that case for the
success path too.

Fixes: a3812a47a320 ("io_uring: drop any code related to SCM_RIGHTS")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
 io_uring/filetable.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/io_uring/filetable.c b/io_uring/filetable.c
index 4660cb89ea9f..a64b4df0ac9c 100644
--- a/io_uring/filetable.c
+++ b/io_uring/filetable.c
@@ -98,7 +98,7 @@ static int io_install_fixed_file(struct io_ring_ctx *ctx, struct file *file,
 	*io_get_tag_slot(ctx->file_data, slot_index) = 0;
 	io_fixed_file_set(file_slot, file);
 	io_file_bitmap_set(&ctx->file_table, slot_index);
-	return 0;
+	ret = 0;
 err:
 	if (needs_switch)
 		io_rsrc_node_switch(ctx, ctx->file_data);
-- 
2.49.0

Re: 6.1-stable fix

[Jens Axboe]

On 4/3/25 10:55 AM, Jens Axboe wrote:
> Hi,
> 
> Ran into an issue testing 6.1, which I discovered was introduced by
> a backport that was done. Here's the fix for it, please add it to
> the 6.1-stable mix. Thanks!

Ping on this - saw a 6.1 stable release this weekend, but this fix
wasn't in it.

-- 
Jens Axboe

Re: 6.1-stable fix

[Greg Kroah-Hartman]

On Mon, Apr 07, 2025 at 07:56:18AM -0600, Jens Axboe wrote:
> On 4/3/25 10:55 AM, Jens Axboe wrote:
> > Hi,
> > 
> > Ran into an issue testing 6.1, which I discovered was introduced by
> > a backport that was done. Here's the fix for it, please add it to
> > the 6.1-stable mix. Thanks!
> 
> Ping on this - saw a 6.1 stable release this weekend, but this fix
> wasn't in it.

That's because you sent this after I announced the -rc1 release :)

I'll add it to the queue now, thanks.

greg k-h

Re: 6.1-stable fix

[Jens Axboe]

On 4/7/25 8:01 AM, Greg Kroah-Hartman wrote:
> On Mon, Apr 07, 2025 at 07:56:18AM -0600, Jens Axboe wrote:
>> On 4/3/25 10:55 AM, Jens Axboe wrote:
>>> Hi,
>>>
>>> Ran into an issue testing 6.1, which I discovered was introduced by
>>> a backport that was done. Here's the fix for it, please add it to
>>> the 6.1-stable mix. Thanks!
>>
>> Ping on this - saw a 6.1 stable release this weekend, but this fix
>> wasn't in it.
> 
> That's because you sent this after I announced the -rc1 release :)

Gotcha, makes sense.

> I'll add it to the queue now, thanks.

Thanks!

-- 
Jens Axboe