From: Greg Kroah-Hartman Date: Mon, 22 May 2023 18:07:39 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v6.3.4~21 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4e5e58c5dd129f209932888802c1b7b180686ec;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: nilfs2-fix-use-after-free-bug-of-nilfs_root-in-nilfs_evict_inode.patch powerpc-64s-radix-fix-soft-dirty-tracking.patch tpm-tpm_tis-disable-interrupts-for-more-lenovo-devices.patch --- diff --git a/queue-5.4/nilfs2-fix-use-after-free-bug-of-nilfs_root-in-nilfs_evict_inode.patch b/queue-5.4/nilfs2-fix-use-after-free-bug-of-nilfs_root-in-nilfs_evict_inode.patch new file mode 100644 index 00000000000..032ac461442 --- /dev/null +++ b/queue-5.4/nilfs2-fix-use-after-free-bug-of-nilfs_root-in-nilfs_evict_inode.patch @@ -0,0 +1,65 @@ +From 9b5a04ac3ad9898c4745cba46ea26de74ba56a8e Mon Sep 17 00:00:00 2001 +From: Ryusuke Konishi +Date: Wed, 10 May 2023 00:29:56 +0900 +Subject: nilfs2: fix use-after-free bug of nilfs_root in nilfs_evict_inode() + +From: Ryusuke Konishi + +commit 9b5a04ac3ad9898c4745cba46ea26de74ba56a8e upstream. + +During unmount process of nilfs2, nothing holds nilfs_root structure after +nilfs2 detaches its writer in nilfs_detach_log_writer(). However, since +nilfs_evict_inode() uses nilfs_root for some cleanup operations, it may +cause use-after-free read if inodes are left in "garbage_list" and +released by nilfs_dispose_list() at the end of nilfs_detach_log_writer(). + +Fix this issue by modifying nilfs_evict_inode() to only clear inode +without additional metadata changes that use nilfs_root if the file system +is degraded to read-only or the writer is detached. + +Link: https://lkml.kernel.org/r/20230509152956.8313-1-konishi.ryusuke@gmail.com +Signed-off-by: Ryusuke Konishi +Reported-by: syzbot+78d4495558999f55d1da@syzkaller.appspotmail.com +Closes: https://lkml.kernel.org/r/00000000000099e5ac05fb1c3b85@google.com +Tested-by: Ryusuke Konishi +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + fs/nilfs2/inode.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +--- a/fs/nilfs2/inode.c ++++ b/fs/nilfs2/inode.c +@@ -930,6 +930,7 @@ void nilfs_evict_inode(struct inode *ino + struct nilfs_transaction_info ti; + struct super_block *sb = inode->i_sb; + struct nilfs_inode_info *ii = NILFS_I(inode); ++ struct the_nilfs *nilfs; + int ret; + + if (inode->i_nlink || !ii->i_root || unlikely(is_bad_inode(inode))) { +@@ -942,6 +943,23 @@ void nilfs_evict_inode(struct inode *ino + + truncate_inode_pages_final(&inode->i_data); + ++ nilfs = sb->s_fs_info; ++ if (unlikely(sb_rdonly(sb) || !nilfs->ns_writer)) { ++ /* ++ * If this inode is about to be disposed after the file system ++ * has been degraded to read-only due to file system corruption ++ * or after the writer has been detached, do not make any ++ * changes that cause writes, just clear it. ++ * Do this check after read-locking ns_segctor_sem by ++ * nilfs_transaction_begin() in order to avoid a race with ++ * the writer detach operation. ++ */ ++ clear_inode(inode); ++ nilfs_clear_inode(inode); ++ nilfs_transaction_abort(sb); ++ return; ++ } ++ + /* TODO: some of the following operations may fail. */ + nilfs_truncate_bmap(ii, 0); + nilfs_mark_inode_dirty(inode); diff --git a/queue-5.4/powerpc-64s-radix-fix-soft-dirty-tracking.patch b/queue-5.4/powerpc-64s-radix-fix-soft-dirty-tracking.patch new file mode 100644 index 00000000000..d176a4f42d7 --- /dev/null +++ b/queue-5.4/powerpc-64s-radix-fix-soft-dirty-tracking.patch @@ -0,0 +1,56 @@ +From 66b2ca086210732954a7790d63d35542936fc664 Mon Sep 17 00:00:00 2001 +From: Michael Ellerman +Date: Thu, 11 May 2023 21:42:24 +1000 +Subject: powerpc/64s/radix: Fix soft dirty tracking +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Michael Ellerman + +commit 66b2ca086210732954a7790d63d35542936fc664 upstream. + +It was reported that soft dirty tracking doesn't work when using the +Radix MMU. + +The tracking is supposed to work by clearing the soft dirty bit for a +mapping and then write protecting the PTE. If/when the page is written +to, a page fault occurs and the soft dirty bit is added back via +pte_mkdirty(). For example in wp_page_reuse(): + + entry = maybe_mkwrite(pte_mkdirty(entry), vma); + if (ptep_set_access_flags(vma, vmf->address, vmf->pte, entry, 1)) + update_mmu_cache(vma, vmf->address, vmf->pte); + +Unfortunately on radix _PAGE_SOFTDIRTY is being dropped by +radix__ptep_set_access_flags(), called from ptep_set_access_flags(), +meaning the soft dirty bit is not set even though the page has been +written to. + +Fix it by adding _PAGE_SOFTDIRTY to the set of bits that are able to be +changed in radix__ptep_set_access_flags(). + +Fixes: b0b5e9b13047 ("powerpc/mm/radix: Add radix pte #defines") +Cc: stable@vger.kernel.org # v4.7+ +Reported-by: Dan Horák +Link: https://lore.kernel.org/r/20230511095558.56663a50f86bdc4cd97700b7@danny.cz +Signed-off-by: Michael Ellerman +Link: https://msgid.link/20230511114224.977423-1-mpe@ellerman.id.au +Signed-off-by: Greg Kroah-Hartman +--- + arch/powerpc/mm/book3s64/radix_pgtable.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/powerpc/mm/book3s64/radix_pgtable.c ++++ b/arch/powerpc/mm/book3s64/radix_pgtable.c +@@ -1018,8 +1018,8 @@ void radix__ptep_set_access_flags(struct + pte_t entry, unsigned long address, int psize) + { + struct mm_struct *mm = vma->vm_mm; +- unsigned long set = pte_val(entry) & (_PAGE_DIRTY | _PAGE_ACCESSED | +- _PAGE_RW | _PAGE_EXEC); ++ unsigned long set = pte_val(entry) & (_PAGE_DIRTY | _PAGE_SOFT_DIRTY | ++ _PAGE_ACCESSED | _PAGE_RW | _PAGE_EXEC); + + unsigned long change = pte_val(entry) ^ pte_val(*ptep); + /* diff --git a/queue-5.4/series b/queue-5.4/series index 341637ae34e..f435d2135d2 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -98,3 +98,6 @@ kvm-x86-do-not-report-a-vcpu-as-preempted-outside-instruction-boundaries.patch statfs-enforce-statfs-structure-initialization.patch serial-add-support-for-advantech-pci-1611u-card.patch ceph-force-updating-the-msg-pointer-in-non-split-case.patch +tpm-tpm_tis-disable-interrupts-for-more-lenovo-devices.patch +powerpc-64s-radix-fix-soft-dirty-tracking.patch +nilfs2-fix-use-after-free-bug-of-nilfs_root-in-nilfs_evict_inode.patch diff --git a/queue-5.4/tpm-tpm_tis-disable-interrupts-for-more-lenovo-devices.patch b/queue-5.4/tpm-tpm_tis-disable-interrupts-for-more-lenovo-devices.patch new file mode 100644 index 00000000000..6079b63c8e8 --- /dev/null +++ b/queue-5.4/tpm-tpm_tis-disable-interrupts-for-more-lenovo-devices.patch @@ -0,0 +1,49 @@ +From e7d3e5c4b1dd50a70b31524c3228c62bb41bbab2 Mon Sep 17 00:00:00 2001 +From: Jerry Snitselaar +Date: Wed, 10 May 2023 17:54:03 -0700 +Subject: tpm/tpm_tis: Disable interrupts for more Lenovo devices + +From: Jerry Snitselaar + +commit e7d3e5c4b1dd50a70b31524c3228c62bb41bbab2 upstream. + +The P360 Tiny suffers from an irq storm issue like the T490s, so add +an entry for it to tpm_tis_dmi_table, and force polling. There also +previously was a report from the previous attempt to enable interrupts +that involved a ThinkPad L490. So an entry is added for it as well. + +Cc: stable@vger.kernel.org +Reported-by: Peter Zijlstra # P360 Tiny +Closes: https://lore.kernel.org/linux-integrity/20230505130731.GO83892@hirez.programming.kicks-ass.net/ +Signed-off-by: Jerry Snitselaar +Signed-off-by: Jarkko Sakkinen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/char/tpm/tpm_tis.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +--- a/drivers/char/tpm/tpm_tis.c ++++ b/drivers/char/tpm/tpm_tis.c +@@ -83,6 +83,22 @@ static const struct dmi_system_id tpm_ti + DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T490s"), + }, + }, ++ { ++ .callback = tpm_tis_disable_irq, ++ .ident = "ThinkStation P360 Tiny", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), ++ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkStation P360 Tiny"), ++ }, ++ }, ++ { ++ .callback = tpm_tis_disable_irq, ++ .ident = "ThinkPad L490", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), ++ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L490"), ++ }, ++ }, + {} + }; +