From: Greg Kroah-Hartman Date: Tue, 29 Jul 2025 14:53:14 +0000 (+0200) Subject: 6.6-stable patches X-Git-Tag: v6.6.101~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c16228ac0bb7b130ed0fd4009dd8daceef28ed0d;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: comedi-comedi_test-fix-possible-deletion-of-uninitialized-timers.patch jfs-reject-on-disk-inodes-of-an-unsupported-type.patch x86-bugs-fix-use-of-possibly-uninit-value-in-amd_check_tsa_microcode.patch --- diff --git a/queue-6.6/comedi-comedi_test-fix-possible-deletion-of-uninitialized-timers.patch b/queue-6.6/comedi-comedi_test-fix-possible-deletion-of-uninitialized-timers.patch new file mode 100644 index 0000000000..83af2a3b1f --- /dev/null +++ b/queue-6.6/comedi-comedi_test-fix-possible-deletion-of-uninitialized-timers.patch @@ -0,0 +1,42 @@ +From 1b98304c09a0192598d0767f1eb8c83d7e793091 Mon Sep 17 00:00:00 2001 +From: Ian Abbott +Date: Tue, 8 Jul 2025 14:06:27 +0100 +Subject: comedi: comedi_test: Fix possible deletion of uninitialized timers + +From: Ian Abbott + +commit 1b98304c09a0192598d0767f1eb8c83d7e793091 upstream. + +In `waveform_common_attach()`, the two timers `&devpriv->ai_timer` and +`&devpriv->ao_timer` are initialized after the allocation of the device +private data by `comedi_alloc_devpriv()` and the subdevices by +`comedi_alloc_subdevices()`. The function may return with an error +between those function calls. In that case, `waveform_detach()` will be +called by the Comedi core to clean up. The check that +`waveform_detach()` uses to decide whether to delete the timers is +incorrect. It only checks that the device private data was allocated, +but that does not guarantee that the timers were initialized. It also +needs to check that the subdevices were allocated. Fix it. + +Fixes: 73e0e4dfed4c ("staging: comedi: comedi_test: fix timer lock-up") +Cc: stable@vger.kernel.org # 6.15+ +Signed-off-by: Ian Abbott +Link: https://lore.kernel.org/r/20250708130627.21743-1-abbotti@mev.co.uk +[ changed timer_delete_sync() to del_timer_sync() ] +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/comedi/drivers/comedi_test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/comedi/drivers/comedi_test.c ++++ b/drivers/comedi/drivers/comedi_test.c +@@ -790,7 +790,7 @@ static void waveform_detach(struct comed + { + struct waveform_private *devpriv = dev->private; + +- if (devpriv) { ++ if (devpriv && dev->n_subdevices) { + del_timer_sync(&devpriv->ai_timer); + del_timer_sync(&devpriv->ao_timer); + } diff --git a/queue-6.6/jfs-reject-on-disk-inodes-of-an-unsupported-type.patch b/queue-6.6/jfs-reject-on-disk-inodes-of-an-unsupported-type.patch new file mode 100644 index 0000000000..4d1d942834 --- /dev/null +++ b/queue-6.6/jfs-reject-on-disk-inodes-of-an-unsupported-type.patch @@ -0,0 +1,112 @@ +From 8c3f9a70d2d4dd6c640afe294b05c6a0a45434d9 Mon Sep 17 00:00:00 2001 +From: Dmitry Antipov +Date: Thu, 7 Nov 2024 08:42:28 +0300 +Subject: jfs: reject on-disk inodes of an unsupported type + +From: Dmitry Antipov + +commit 8c3f9a70d2d4dd6c640afe294b05c6a0a45434d9 upstream. + +Syzbot has reported the following BUG: + +kernel BUG at fs/inode.c:668! +Oops: invalid opcode: 0000 [#1] PREEMPT SMP KASAN PTI +CPU: 3 UID: 0 PID: 139 Comm: jfsCommit Not tainted 6.12.0-rc4-syzkaller-00085-g4e46774408d9 #0 +Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-3.fc41 04/01/2014 +RIP: 0010:clear_inode+0x168/0x190 +Code: 4c 89 f7 e8 ba fe e5 ff e9 61 ff ff ff 44 89 f1 80 e1 07 80 c1 03 38 c1 7c c1 4c 89 f7 e8 90 ff e5 ff eb b7 + 0b e8 01 5d 7f ff 90 0f 0b e8 f9 5c 7f ff 90 0f 0b e8 f1 5c 7f +RSP: 0018:ffffc900027dfae8 EFLAGS: 00010093 +RAX: ffffffff82157a87 RBX: 0000000000000001 RCX: ffff888104d4b980 +RDX: 0000000000000000 RSI: 0000000000000001 RDI: 0000000000000000 +RBP: ffffc900027dfc90 R08: ffffffff82157977 R09: fffff520004fbf38 +R10: dffffc0000000000 R11: fffff520004fbf38 R12: dffffc0000000000 +R13: ffff88811315bc00 R14: ffff88811315bda8 R15: ffff88811315bb80 +FS: 0000000000000000(0000) GS:ffff888135f00000(0000) knlGS:0000000000000000 +CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +CR2: 00005565222e0578 CR3: 0000000026ef0000 CR4: 00000000000006f0 +Call Trace: + + ? __die_body+0x5f/0xb0 + ? die+0x9e/0xc0 + ? do_trap+0x15a/0x3a0 + ? clear_inode+0x168/0x190 + ? do_error_trap+0x1dc/0x2c0 + ? clear_inode+0x168/0x190 + ? __pfx_do_error_trap+0x10/0x10 + ? report_bug+0x3cd/0x500 + ? handle_invalid_op+0x34/0x40 + ? clear_inode+0x168/0x190 + ? exc_invalid_op+0x38/0x50 + ? asm_exc_invalid_op+0x1a/0x20 + ? clear_inode+0x57/0x190 + ? clear_inode+0x167/0x190 + ? clear_inode+0x168/0x190 + ? clear_inode+0x167/0x190 + jfs_evict_inode+0xb5/0x440 + ? __pfx_jfs_evict_inode+0x10/0x10 + evict+0x4ea/0x9b0 + ? __pfx_evict+0x10/0x10 + ? iput+0x713/0xa50 + txUpdateMap+0x931/0xb10 + ? __pfx_txUpdateMap+0x10/0x10 + jfs_lazycommit+0x49a/0xb80 + ? _raw_spin_unlock_irqrestore+0x8f/0x140 + ? lockdep_hardirqs_on+0x99/0x150 + ? __pfx_jfs_lazycommit+0x10/0x10 + ? __pfx_default_wake_function+0x10/0x10 + ? __kthread_parkme+0x169/0x1d0 + ? __pfx_jfs_lazycommit+0x10/0x10 + kthread+0x2f2/0x390 + ? __pfx_jfs_lazycommit+0x10/0x10 + ? __pfx_kthread+0x10/0x10 + ret_from_fork+0x4d/0x80 + ? __pfx_kthread+0x10/0x10 + ret_from_fork_asm+0x1a/0x30 + + +This happens when 'clear_inode()' makes an attempt to finalize an underlying +JFS inode of unknown type. According to JFS layout description from +https://jfs.sourceforge.net/project/pub/jfslayout.pdf, inode types from 5 to +15 are reserved for future extensions and should not be encountered on a valid +filesystem. So add an extra check for valid inode type in 'copy_from_dinode()'. + +Reported-by: syzbot+ac2116e48989e84a2893@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=ac2116e48989e84a2893 +Fixes: 79ac5a46c5c1 ("jfs_lookup(): don't bother with . or ..") +Signed-off-by: Dmitry Antipov +Signed-off-by: Dave Kleikamp +Signed-off-by: Aditya Dutt +Signed-off-by: Greg Kroah-Hartman +--- + fs/jfs/jfs_imap.c | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +--- a/fs/jfs/jfs_imap.c ++++ b/fs/jfs/jfs_imap.c +@@ -3029,14 +3029,23 @@ static void duplicateIXtree(struct super + * + * RETURN VALUES: + * 0 - success +- * -ENOMEM - insufficient memory ++ * -EINVAL - unexpected inode type + */ + static int copy_from_dinode(struct dinode * dip, struct inode *ip) + { + struct jfs_inode_info *jfs_ip = JFS_IP(ip); + struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb); ++ int fileset = le32_to_cpu(dip->di_fileset); + +- jfs_ip->fileset = le32_to_cpu(dip->di_fileset); ++ switch (fileset) { ++ case AGGR_RESERVED_I: case AGGREGATE_I: case BMAP_I: ++ case LOG_I: case BADBLOCK_I: case FILESYSTEM_I: ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ jfs_ip->fileset = fileset; + jfs_ip->mode2 = le32_to_cpu(dip->di_mode); + jfs_set_inode_flags(ip); + diff --git a/queue-6.6/series b/queue-6.6/series index c43efc1418..4fb83e96ea 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -49,3 +49,6 @@ drm-amdkfd-don-t-call-mmput-from-mmu-notifier-callback.patch usb-typec-tcpm-allow-to-use-sink-in-accessory-mode.patch usb-typec-tcpm-allow-switching-to-mode-accessory-to-mux-properly.patch usb-typec-tcpm-apply-vbus-before-data-bringup-in-tcpm_src_attach.patch +x86-bugs-fix-use-of-possibly-uninit-value-in-amd_check_tsa_microcode.patch +jfs-reject-on-disk-inodes-of-an-unsupported-type.patch +comedi-comedi_test-fix-possible-deletion-of-uninitialized-timers.patch diff --git a/queue-6.6/x86-bugs-fix-use-of-possibly-uninit-value-in-amd_check_tsa_microcode.patch b/queue-6.6/x86-bugs-fix-use-of-possibly-uninit-value-in-amd_check_tsa_microcode.patch new file mode 100644 index 0000000000..1bce01c3f4 --- /dev/null +++ b/queue-6.6/x86-bugs-fix-use-of-possibly-uninit-value-in-amd_check_tsa_microcode.patch @@ -0,0 +1,36 @@ +From mzhivich@akamai.com Tue Jul 29 16:34:40 2025 +From: Michael Zhivich +Date: Wed, 23 Jul 2025 09:40:19 -0400 +Subject: x86/bugs: Fix use of possibly uninit value in amd_check_tsa_microcode() +To: , +Cc: , , , , , Michael Zhivich +Message-ID: <20250723134019.2370983-1-mzhivich@akamai.com> + +From: Michael Zhivich + +For kernels compiled with CONFIG_INIT_STACK_NONE=y, the value of __reserved +field in zen_patch_rev union on the stack may be garbage. If so, it will +prevent correct microcode check when consulting p.ucode_rev, resulting in +incorrect mitigation selection. + +This is a stable-only fix. + +Cc: +Signed-off-by: Michael Zhivich +Fixes: 90293047df18 ("x86/bugs: Add a Transient Scheduler Attacks mitigation") +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kernel/cpu/amd.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/x86/kernel/cpu/amd.c ++++ b/arch/x86/kernel/cpu/amd.c +@@ -549,6 +549,8 @@ static bool amd_check_tsa_microcode(void + p.model = c->x86_model; + p.ext_model = c->x86_model >> 4; + p.stepping = c->x86_stepping; ++ /* reserved bits are expected to be 0 in test below */ ++ p.__reserved = 0; + + if (cpu_has(c, X86_FEATURE_ZEN3) || + cpu_has(c, X86_FEATURE_ZEN4)) {