From: Greg Kroah-Hartman Date: Thu, 21 May 2026 11:25:09 +0000 (+0200) Subject: 7.0-stable patches X-Git-Tag: v6.6.141~24 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=eebea7669db7eda30cc0811c5c4ea8e2073ad979;p=thirdparty%2Fkernel%2Fstable-queue.git 7.0-stable patches added patches: tracefs-removed-unused-ret-variable-in-eventfs_iterate.patch workqueue-annotate-alloc_workqueue_va-with-__printf-1-0.patch --- diff --git a/queue-7.0/series b/queue-7.0/series index 5e11a8c76d..8954db30b0 100644 --- a/queue-7.0/series +++ b/queue-7.0/series @@ -1145,3 +1145,5 @@ smb-client-use-fullsessionkey-for-aes-256-encryption-key-derivation.patch spi-sifive-simplify-clock-handling-with-devm_clk_get_enabled.patch spi-sifive-fix-controller-deregistration.patch net-rds-reset-op_nents-when-zerocopy-page-pin-fails.patch +tracefs-removed-unused-ret-variable-in-eventfs_iterate.patch +workqueue-annotate-alloc_workqueue_va-with-__printf-1-0.patch diff --git a/queue-7.0/tracefs-removed-unused-ret-variable-in-eventfs_iterate.patch b/queue-7.0/tracefs-removed-unused-ret-variable-in-eventfs_iterate.patch new file mode 100644 index 0000000000..751ac6517a --- /dev/null +++ b/queue-7.0/tracefs-removed-unused-ret-variable-in-eventfs_iterate.patch @@ -0,0 +1,43 @@ +From 43cec30c44764c4b1401fdeb48bfd18c3fc7eff8 Mon Sep 17 00:00:00 2001 +From: Steven Rostedt +Date: Tue, 14 Apr 2026 11:03:44 -0400 +Subject: tracefs: Removed unused 'ret' variable in eventfs_iterate() + +From: Steven Rostedt + +commit 43cec30c44764c4b1401fdeb48bfd18c3fc7eff8 upstream. + +Moving to guard() usage removed the need of using the 'ret' variable but +it wasn't removed. As it was set to zero, the compiler in use didn't warn +(although some compilers do). + +Cc: Masami Hiramatsu +Cc: Mathieu Desnoyers +Link: https://patch.msgid.link/20260414110344.75c0663f@robin +Fixes: 4d9b262031f ("eventfs: Simplify code using guard()s") +Reported-by: kernel test robot +Closes: https://lore.kernel.org/oe-kbuild-all/202604100111.AAlbQKmK-lkp@intel.com/ +Signed-off-by: Steven Rostedt (Google) +Signed-off-by: Greg Kroah-Hartman +--- + fs/tracefs/event_inode.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/fs/tracefs/event_inode.c ++++ b/fs/tracefs/event_inode.c +@@ -576,7 +576,6 @@ static int eventfs_iterate(struct file * + struct eventfs_inode *ei; + const char *name; + umode_t mode; +- int ret = -EINVAL; + int ino; + int i, r, c; + +@@ -601,7 +600,6 @@ static int eventfs_iterate(struct file * + * Need to create the dentries and inodes to have a consistent + * inode number. + */ +- ret = 0; + + /* Start at 'c' to jump over already read entries */ + for (i = c; i < ei->nr_entries; i++, ctx->pos++) { diff --git a/queue-7.0/workqueue-annotate-alloc_workqueue_va-with-__printf-1-0.patch b/queue-7.0/workqueue-annotate-alloc_workqueue_va-with-__printf-1-0.patch new file mode 100644 index 0000000000..7beca894d0 --- /dev/null +++ b/queue-7.0/workqueue-annotate-alloc_workqueue_va-with-__printf-1-0.patch @@ -0,0 +1,33 @@ +From 20e81c64c905bd765e69ef07920d2b1130dc79b6 Mon Sep 17 00:00:00 2001 +From: Tejun Heo +Date: Wed, 29 Apr 2026 09:44:16 -1000 +Subject: workqueue: Annotate alloc_workqueue_va() with __printf(1, 0) + +From: Tejun Heo + +commit 20e81c64c905bd765e69ef07920d2b1130dc79b6 upstream. + +alloc_workqueue_va() forwards its va_list to __alloc_workqueue() which +ultimately feeds vsnprintf(). __alloc_workqueue() already carries +__printf(1, 0); the new wrapper needs the same annotation so format +string checking propagates through the forwarding. + +Fixes: 0de4cb473aed ("workqueue: fix devm_alloc_workqueue() va_list misuse") +Reported-by: kernel test robot +Closes: https://lore.kernel.org/oe-kbuild-all/202604300347.2LgXyteh-lkp@intel.com/ +Signed-off-by: Tejun Heo +Signed-off-by: Greg Kroah-Hartman +--- + kernel/workqueue.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/kernel/workqueue.c ++++ b/kernel/workqueue.c +@@ -5887,6 +5887,7 @@ err_destroy: + return NULL; + } + ++__printf(1, 0) + static struct workqueue_struct *alloc_workqueue_va(const char *fmt, + unsigned int flags, + int max_active,