From: Greg Kroah-Hartman Date: Mon, 7 Apr 2025 14:15:58 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v5.4.292~77 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e015edcfa9b96c942d74817cf4dade30a952be24;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: io_uring-filetable-ensure-node-switch-is-always-done-if-needed.patch --- diff --git a/queue-6.1/io_uring-filetable-ensure-node-switch-is-always-done-if-needed.patch b/queue-6.1/io_uring-filetable-ensure-node-switch-is-always-done-if-needed.patch new file mode 100644 index 0000000000..d932b56227 --- /dev/null +++ b/queue-6.1/io_uring-filetable-ensure-node-switch-is-always-done-if-needed.patch @@ -0,0 +1,34 @@ +From 5a0743d2fd97f0b73b78305a9a155a164d8ce4f5 Mon Sep 17 00:00:00 2001 +From: Jens Axboe +Date: Thu, 3 Apr 2025 10:48:49 -0600 +Subject: io_uring/filetable: ensure node switch is always done, if needed + +From: Jens Axboe + +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 +Signed-off-by: Greg Kroah-Hartman +--- + io_uring/filetable.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/io_uring/filetable.c ++++ b/io_uring/filetable.c +@@ -98,7 +98,7 @@ static int io_install_fixed_file(struct + *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); diff --git a/queue-6.1/series b/queue-6.1/series index 458fef4dca..056f4db85a 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -167,3 +167,4 @@ net-fix-geneve_opt-length-integer-overflow.patch ipv6-start-path-selection-from-the-first-nexthop.patch ipv6-do-not-consider-link-down-nexthops-in-path-sele.patch arcnet-add-null-check-in-com20020pci_probe.patch +io_uring-filetable-ensure-node-switch-is-always-done-if-needed.patch