From: Greg Kroah-Hartman Date: Wed, 26 Oct 2022 15:15:06 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v5.10.151~55 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=528a0d49b376b0e64ff4e9dc18e34e49e61dad7a;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: ata-ahci-imx-fix-module_alias.patch ata-ahci-match-em_max_slots-with-sata_pmp_max_ports.patch ocfs2-clear-dinode-links-count-in-case-of-error.patch ocfs2-fix-bug-when-iput-after-ocfs2_mknod-fails.patch --- diff --git a/queue-4.9/ata-ahci-imx-fix-module_alias.patch b/queue-4.9/ata-ahci-imx-fix-module_alias.patch new file mode 100644 index 00000000000..d4e33984c88 --- /dev/null +++ b/queue-4.9/ata-ahci-imx-fix-module_alias.patch @@ -0,0 +1,30 @@ +From 979556f1521a835a059de3b117b9c6c6642c7d58 Mon Sep 17 00:00:00 2001 +From: Alexander Stein +Date: Wed, 12 Oct 2022 15:11:05 +0200 +Subject: ata: ahci-imx: Fix MODULE_ALIAS + +From: Alexander Stein + +commit 979556f1521a835a059de3b117b9c6c6642c7d58 upstream. + +'ahci:' is an invalid prefix, preventing the module from autoloading. +Fix this by using the 'platform:' prefix and DRV_NAME. + +Fixes: 9e54eae23bc9 ("ahci_imx: add ahci sata support on imx platforms") +Cc: stable@vger.kernel.org +Signed-off-by: Alexander Stein +Reviewed-by: Fabio Estevam +Signed-off-by: Damien Le Moal +Signed-off-by: Greg Kroah-Hartman +--- + drivers/ata/ahci_imx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/ata/ahci_imx.c ++++ b/drivers/ata/ahci_imx.c +@@ -691,4 +691,4 @@ module_platform_driver(imx_ahci_driver); + MODULE_DESCRIPTION("Freescale i.MX AHCI SATA platform driver"); + MODULE_AUTHOR("Richard Zhu "); + MODULE_LICENSE("GPL"); +-MODULE_ALIAS("ahci:imx"); ++MODULE_ALIAS("platform:" DRV_NAME); diff --git a/queue-4.9/ata-ahci-match-em_max_slots-with-sata_pmp_max_ports.patch b/queue-4.9/ata-ahci-match-em_max_slots-with-sata_pmp_max_ports.patch new file mode 100644 index 00000000000..01b5f7c989d --- /dev/null +++ b/queue-4.9/ata-ahci-match-em_max_slots-with-sata_pmp_max_ports.patch @@ -0,0 +1,76 @@ +From 1e41e693f458eef2d5728207dbd327cd3b16580a Mon Sep 17 00:00:00 2001 +From: Kai-Heng Feng +Date: Tue, 11 Oct 2022 10:46:17 +0800 +Subject: ata: ahci: Match EM_MAX_SLOTS with SATA_PMP_MAX_PORTS + +From: Kai-Heng Feng + +commit 1e41e693f458eef2d5728207dbd327cd3b16580a upstream. + +UBSAN complains about array-index-out-of-bounds: +[ 1.980703] kernel: UBSAN: array-index-out-of-bounds in /build/linux-9H675w/linux-5.15.0/drivers/ata/libahci.c:968:41 +[ 1.980709] kernel: index 15 is out of range for type 'ahci_em_priv [8]' +[ 1.980713] kernel: CPU: 0 PID: 209 Comm: scsi_eh_8 Not tainted 5.15.0-25-generic #25-Ubuntu +[ 1.980716] kernel: Hardware name: System manufacturer System Product Name/P5Q3, BIOS 1102 06/11/2010 +[ 1.980718] kernel: Call Trace: +[ 1.980721] kernel: +[ 1.980723] kernel: show_stack+0x52/0x58 +[ 1.980729] kernel: dump_stack_lvl+0x4a/0x5f +[ 1.980734] kernel: dump_stack+0x10/0x12 +[ 1.980736] kernel: ubsan_epilogue+0x9/0x45 +[ 1.980739] kernel: __ubsan_handle_out_of_bounds.cold+0x44/0x49 +[ 1.980742] kernel: ahci_qc_issue+0x166/0x170 [libahci] +[ 1.980748] kernel: ata_qc_issue+0x135/0x240 +[ 1.980752] kernel: ata_exec_internal_sg+0x2c4/0x580 +[ 1.980754] kernel: ? vprintk_default+0x1d/0x20 +[ 1.980759] kernel: ata_exec_internal+0x67/0xa0 +[ 1.980762] kernel: sata_pmp_read+0x8d/0xc0 +[ 1.980765] kernel: sata_pmp_read_gscr+0x3c/0x90 +[ 1.980768] kernel: sata_pmp_attach+0x8b/0x310 +[ 1.980771] kernel: ata_eh_revalidate_and_attach+0x28c/0x4b0 +[ 1.980775] kernel: ata_eh_recover+0x6b6/0xb30 +[ 1.980778] kernel: ? ahci_do_hardreset+0x180/0x180 [libahci] +[ 1.980783] kernel: ? ahci_stop_engine+0xb0/0xb0 [libahci] +[ 1.980787] kernel: ? ahci_do_softreset+0x290/0x290 [libahci] +[ 1.980792] kernel: ? trace_event_raw_event_ata_eh_link_autopsy_qc+0xe0/0xe0 +[ 1.980795] kernel: sata_pmp_eh_recover.isra.0+0x214/0x560 +[ 1.980799] kernel: sata_pmp_error_handler+0x23/0x40 +[ 1.980802] kernel: ahci_error_handler+0x43/0x80 [libahci] +[ 1.980806] kernel: ata_scsi_port_error_handler+0x2b1/0x600 +[ 1.980810] kernel: ata_scsi_error+0x9c/0xd0 +[ 1.980813] kernel: scsi_error_handler+0xa1/0x180 +[ 1.980817] kernel: ? scsi_unjam_host+0x1c0/0x1c0 +[ 1.980820] kernel: kthread+0x12a/0x150 +[ 1.980823] kernel: ? set_kthread_struct+0x50/0x50 +[ 1.980826] kernel: ret_from_fork+0x22/0x30 +[ 1.980831] kernel: + +This happens because sata_pmp_init_links() initialize link->pmp up to +SATA_PMP_MAX_PORTS while em_priv is declared as 8 elements array. + +I can't find the maximum Enclosure Management ports specified in AHCI +spec v1.3.1, but "12.2.1 LED message type" states that "Port Multiplier +Information" can utilize 4 bits, which implies it can support up to 16 +ports. Hence, use SATA_PMP_MAX_PORTS as EM_MAX_SLOTS to resolve the +issue. + +BugLink: https://bugs.launchpad.net/bugs/1970074 +Cc: stable@vger.kernel.org +Signed-off-by: Kai-Heng Feng +Signed-off-by: Damien Le Moal +Signed-off-by: Greg Kroah-Hartman +--- + drivers/ata/ahci.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/ata/ahci.h ++++ b/drivers/ata/ahci.h +@@ -257,7 +257,7 @@ enum { + ICH_MAP = 0x90, /* ICH MAP register */ + + /* em constants */ +- EM_MAX_SLOTS = 8, ++ EM_MAX_SLOTS = SATA_PMP_MAX_PORTS, + EM_MAX_RETRY = 5, + + /* em_ctl bits */ diff --git a/queue-4.9/ocfs2-clear-dinode-links-count-in-case-of-error.patch b/queue-4.9/ocfs2-clear-dinode-links-count-in-case-of-error.patch new file mode 100644 index 00000000000..674d4159a2a --- /dev/null +++ b/queue-4.9/ocfs2-clear-dinode-links-count-in-case-of-error.patch @@ -0,0 +1,77 @@ +From 28f4821b1b53e0649706912e810c6c232fc506f9 Mon Sep 17 00:00:00 2001 +From: Joseph Qi +Date: Mon, 17 Oct 2022 21:02:27 +0800 +Subject: ocfs2: clear dinode links count in case of error + +From: Joseph Qi + +commit 28f4821b1b53e0649706912e810c6c232fc506f9 upstream. + +In ocfs2_mknod(), if error occurs after dinode successfully allocated, +ocfs2 i_links_count will not be 0. + +So even though we clear inode i_nlink before iput in error handling, it +still won't wipe inode since we'll refresh inode from dinode during inode +lock. So just like clear inode i_nlink, we clear ocfs2 i_links_count as +well. Also do the same change for ocfs2_symlink(). + +Link: https://lkml.kernel.org/r/20221017130227.234480-2-joseph.qi@linux.alibaba.com +Signed-off-by: Joseph Qi +Reported-by: Yan Wang +Cc: Mark Fasheh +Cc: Joel Becker +Cc: Junxiao Bi +Cc: Changwei Ge +Cc: Gang He +Cc: Jun Piao +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + fs/ocfs2/namei.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +--- a/fs/ocfs2/namei.c ++++ b/fs/ocfs2/namei.c +@@ -244,6 +244,7 @@ static int ocfs2_mknod(struct inode *dir + handle_t *handle = NULL; + struct ocfs2_super *osb; + struct ocfs2_dinode *dirfe; ++ struct ocfs2_dinode *fe = NULL; + struct buffer_head *new_fe_bh = NULL; + struct inode *inode = NULL; + struct ocfs2_alloc_context *inode_ac = NULL; +@@ -394,6 +395,7 @@ static int ocfs2_mknod(struct inode *dir + goto leave; + } + ++ fe = (struct ocfs2_dinode *) new_fe_bh->b_data; + if (S_ISDIR(mode)) { + status = ocfs2_fill_new_dir(osb, handle, dir, inode, + new_fe_bh, data_ac, meta_ac); +@@ -459,8 +461,11 @@ static int ocfs2_mknod(struct inode *dir + leave: + if (status < 0 && did_quota_inode) + dquot_free_inode(inode); +- if (handle) ++ if (handle) { ++ if (status < 0 && fe) ++ ocfs2_set_links_count(fe, 0); + ocfs2_commit_trans(osb, handle); ++ } + + ocfs2_inode_unlock(dir, 1); + if (did_block_signals) +@@ -2028,8 +2033,11 @@ bail: + ocfs2_clusters_to_bytes(osb->sb, 1)); + if (status < 0 && did_quota_inode) + dquot_free_inode(inode); +- if (handle) ++ if (handle) { ++ if (status < 0 && fe) ++ ocfs2_set_links_count(fe, 0); + ocfs2_commit_trans(osb, handle); ++ } + + ocfs2_inode_unlock(dir, 1); + if (did_block_signals) diff --git a/queue-4.9/ocfs2-fix-bug-when-iput-after-ocfs2_mknod-fails.patch b/queue-4.9/ocfs2-fix-bug-when-iput-after-ocfs2_mknod-fails.patch new file mode 100644 index 00000000000..07d510aad04 --- /dev/null +++ b/queue-4.9/ocfs2-fix-bug-when-iput-after-ocfs2_mknod-fails.patch @@ -0,0 +1,60 @@ +From 759a7c6126eef5635506453e9b9d55a6a3ac2084 Mon Sep 17 00:00:00 2001 +From: Joseph Qi +Date: Mon, 17 Oct 2022 21:02:26 +0800 +Subject: ocfs2: fix BUG when iput after ocfs2_mknod fails + +From: Joseph Qi + +commit 759a7c6126eef5635506453e9b9d55a6a3ac2084 upstream. + +Commit b1529a41f777 "ocfs2: should reclaim the inode if +'__ocfs2_mknod_locked' returns an error" tried to reclaim the claimed +inode if __ocfs2_mknod_locked() fails later. But this introduce a race, +the freed bit may be reused immediately by another thread, which will +update dinode, e.g. i_generation. Then iput this inode will lead to BUG: +inode->i_generation != le32_to_cpu(fe->i_generation) + +We could make this inode as bad, but we did want to do operations like +wipe in some cases. Since the claimed inode bit can only affect that an +dinode is missing and will return back after fsck, it seems not a big +problem. So just leave it as is by revert the reclaim logic. + +Link: https://lkml.kernel.org/r/20221017130227.234480-1-joseph.qi@linux.alibaba.com +Fixes: b1529a41f777 ("ocfs2: should reclaim the inode if '__ocfs2_mknod_locked' returns an error") +Signed-off-by: Joseph Qi +Reported-by: Yan Wang +Cc: Mark Fasheh +Cc: Joel Becker +Cc: Junxiao Bi +Cc: Changwei Ge +Cc: Gang He +Cc: Jun Piao +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + fs/ocfs2/namei.c | 11 +---------- + 1 file changed, 1 insertion(+), 10 deletions(-) + +--- a/fs/ocfs2/namei.c ++++ b/fs/ocfs2/namei.c +@@ -641,18 +641,9 @@ static int ocfs2_mknod_locked(struct ocf + return status; + } + +- status = __ocfs2_mknod_locked(dir, inode, dev, new_fe_bh, ++ return __ocfs2_mknod_locked(dir, inode, dev, new_fe_bh, + parent_fe_bh, handle, inode_ac, + fe_blkno, suballoc_loc, suballoc_bit); +- if (status < 0) { +- u64 bg_blkno = ocfs2_which_suballoc_group(fe_blkno, suballoc_bit); +- int tmp = ocfs2_free_suballoc_bits(handle, inode_ac->ac_inode, +- inode_ac->ac_bh, suballoc_bit, bg_blkno, 1); +- if (tmp) +- mlog_errno(tmp); +- } +- +- return status; + } + + static int ocfs2_mkdir(struct inode *dir, diff --git a/queue-4.9/series b/queue-4.9/series new file mode 100644 index 00000000000..ad61da478c4 --- /dev/null +++ b/queue-4.9/series @@ -0,0 +1,4 @@ +ocfs2-clear-dinode-links-count-in-case-of-error.patch +ocfs2-fix-bug-when-iput-after-ocfs2_mknod-fails.patch +ata-ahci-imx-fix-module_alias.patch +ata-ahci-match-em_max_slots-with-sata_pmp_max_ports.patch