From 1ea5d6794e5827397d513adb6a17b4a58eaa6ce8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 28 Sep 2020 14:33:46 +0200 Subject: [PATCH] drop ata-sata_mv-avoid-trigerrable-bug_on.patch from everywhere --- ...ata-sata_mv-avoid-trigerrable-bug_on.patch | 57 ------------------- queue-4.14/series | 1 - ...ata-sata_mv-avoid-trigerrable-bug_on.patch | 57 ------------------- queue-4.19/series | 1 - ...ata-sata_mv-avoid-trigerrable-bug_on.patch | 57 ------------------- queue-4.4/series | 1 - ...ata-sata_mv-avoid-trigerrable-bug_on.patch | 57 ------------------- queue-4.9/series | 1 - ...ata-sata_mv-avoid-trigerrable-bug_on.patch | 57 ------------------- queue-5.4/series | 1 - 10 files changed, 290 deletions(-) delete mode 100644 queue-4.14/ata-sata_mv-avoid-trigerrable-bug_on.patch delete mode 100644 queue-4.19/ata-sata_mv-avoid-trigerrable-bug_on.patch delete mode 100644 queue-4.4/ata-sata_mv-avoid-trigerrable-bug_on.patch delete mode 100644 queue-4.9/ata-sata_mv-avoid-trigerrable-bug_on.patch delete mode 100644 queue-5.4/ata-sata_mv-avoid-trigerrable-bug_on.patch diff --git a/queue-4.14/ata-sata_mv-avoid-trigerrable-bug_on.patch b/queue-4.14/ata-sata_mv-avoid-trigerrable-bug_on.patch deleted file mode 100644 index a5c1ad92de0..00000000000 --- a/queue-4.14/ata-sata_mv-avoid-trigerrable-bug_on.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 15f26ca39a983e900ccad1eaacee6a2927808401 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 31 Oct 2019 10:59:46 +0100 -Subject: ata: sata_mv, avoid trigerrable BUG_ON - -From: Jiri Slaby - -[ Upstream commit e9f691d899188679746eeb96e6cb520459eda9b4 ] - -There are several reports that the BUG_ON on unsupported command in -mv_qc_prep can be triggered under some circumstances: -https://bugzilla.suse.com/show_bug.cgi?id=1110252 -https://serverfault.com/questions/888897/raid-problems-after-power-outage -https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1652185 -https://bugs.centos.org/view.php?id=14998 - -Let sata_mv handle the failure gracefully: warn about that incl. the -failed command number and return an AC_ERR_INVALID error. We can do that -now thanks to the previous patch. - -Remove also the long-standing FIXME. - -[v2] use %.2x as commands are defined as hexa. - -Signed-off-by: Jiri Slaby -Cc: Jens Axboe -Cc: linux-ide@vger.kernel.org -Cc: Sergei Shtylyov -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - drivers/ata/sata_mv.c | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c -index 3b2246dded74f..d897deb4bffbe 100644 ---- a/drivers/ata/sata_mv.c -+++ b/drivers/ata/sata_mv.c -@@ -2111,12 +2111,10 @@ static void mv_qc_prep(struct ata_queued_cmd *qc) - * non-NCQ mode are: [RW] STREAM DMA and W DMA FUA EXT, none - * of which are defined/used by Linux. If we get here, this - * driver needs work. -- * -- * FIXME: modify libata to give qc_prep a return value and -- * return error here. - */ -- BUG_ON(tf->command); -- break; -+ ata_port_err(ap, "%s: unsupported command: %.2x\n", __func__, -+ tf->command); -+ return AC_ERR_INVALID; - } - mv_crqb_pack_cmd(cw++, tf->nsect, ATA_REG_NSECT, 0); - mv_crqb_pack_cmd(cw++, tf->hob_lbal, ATA_REG_LBAL, 0); --- -2.25.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 437d1dd0de6..41b4e1b7e56 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -21,7 +21,6 @@ m68k-q40-fix-info-leak-in-rtc_ioctl.patch gma-gma500-fix-a-memory-disclosure-bug-due-to-uninit.patch asoc-kirkwood-fix-irq-error-handling.patch media-smiapp-fix-error-handling-at-nvm-reading.patch -ata-sata_mv-avoid-trigerrable-bug_on.patch pm-devfreq-tegra30-fix-integer-overflow-on-cpu-s-fre.patch scsi-fnic-fix-use-after-free.patch clk-ti-adpll-allocate-room-for-terminating-null.patch diff --git a/queue-4.19/ata-sata_mv-avoid-trigerrable-bug_on.patch b/queue-4.19/ata-sata_mv-avoid-trigerrable-bug_on.patch deleted file mode 100644 index a001251e94c..00000000000 --- a/queue-4.19/ata-sata_mv-avoid-trigerrable-bug_on.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 35e584e3f07a978a585d7b9e4176c03a1a45af65 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 31 Oct 2019 10:59:46 +0100 -Subject: ata: sata_mv, avoid trigerrable BUG_ON - -From: Jiri Slaby - -[ Upstream commit e9f691d899188679746eeb96e6cb520459eda9b4 ] - -There are several reports that the BUG_ON on unsupported command in -mv_qc_prep can be triggered under some circumstances: -https://bugzilla.suse.com/show_bug.cgi?id=1110252 -https://serverfault.com/questions/888897/raid-problems-after-power-outage -https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1652185 -https://bugs.centos.org/view.php?id=14998 - -Let sata_mv handle the failure gracefully: warn about that incl. the -failed command number and return an AC_ERR_INVALID error. We can do that -now thanks to the previous patch. - -Remove also the long-standing FIXME. - -[v2] use %.2x as commands are defined as hexa. - -Signed-off-by: Jiri Slaby -Cc: Jens Axboe -Cc: linux-ide@vger.kernel.org -Cc: Sergei Shtylyov -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - drivers/ata/sata_mv.c | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c -index ab2e9f62ddc1a..25d24ed3385ab 100644 ---- a/drivers/ata/sata_mv.c -+++ b/drivers/ata/sata_mv.c -@@ -2111,12 +2111,10 @@ static void mv_qc_prep(struct ata_queued_cmd *qc) - * non-NCQ mode are: [RW] STREAM DMA and W DMA FUA EXT, none - * of which are defined/used by Linux. If we get here, this - * driver needs work. -- * -- * FIXME: modify libata to give qc_prep a return value and -- * return error here. - */ -- BUG_ON(tf->command); -- break; -+ ata_port_err(ap, "%s: unsupported command: %.2x\n", __func__, -+ tf->command); -+ return AC_ERR_INVALID; - } - mv_crqb_pack_cmd(cw++, tf->nsect, ATA_REG_NSECT, 0); - mv_crqb_pack_cmd(cw++, tf->hob_lbal, ATA_REG_LBAL, 0); --- -2.25.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 6955d2953b9..da7a5bb3cfc 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -9,7 +9,6 @@ m68k-q40-fix-info-leak-in-rtc_ioctl.patch gma-gma500-fix-a-memory-disclosure-bug-due-to-uninit.patch asoc-kirkwood-fix-irq-error-handling.patch media-smiapp-fix-error-handling-at-nvm-reading.patch -ata-sata_mv-avoid-trigerrable-bug_on.patch leds-mlxreg-fix-possible-buffer-overflow.patch pm-devfreq-tegra30-fix-integer-overflow-on-cpu-s-fre.patch scsi-fnic-fix-use-after-free.patch diff --git a/queue-4.4/ata-sata_mv-avoid-trigerrable-bug_on.patch b/queue-4.4/ata-sata_mv-avoid-trigerrable-bug_on.patch deleted file mode 100644 index 56addb94c4c..00000000000 --- a/queue-4.4/ata-sata_mv-avoid-trigerrable-bug_on.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 4b308d858a1a34dae1e38948f2c0497161d9ddd8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 31 Oct 2019 10:59:46 +0100 -Subject: ata: sata_mv, avoid trigerrable BUG_ON - -From: Jiri Slaby - -[ Upstream commit e9f691d899188679746eeb96e6cb520459eda9b4 ] - -There are several reports that the BUG_ON on unsupported command in -mv_qc_prep can be triggered under some circumstances: -https://bugzilla.suse.com/show_bug.cgi?id=1110252 -https://serverfault.com/questions/888897/raid-problems-after-power-outage -https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1652185 -https://bugs.centos.org/view.php?id=14998 - -Let sata_mv handle the failure gracefully: warn about that incl. the -failed command number and return an AC_ERR_INVALID error. We can do that -now thanks to the previous patch. - -Remove also the long-standing FIXME. - -[v2] use %.2x as commands are defined as hexa. - -Signed-off-by: Jiri Slaby -Cc: Jens Axboe -Cc: linux-ide@vger.kernel.org -Cc: Sergei Shtylyov -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - drivers/ata/sata_mv.c | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c -index 729f26322095e..c24bbdb3f76c8 100644 ---- a/drivers/ata/sata_mv.c -+++ b/drivers/ata/sata_mv.c -@@ -2113,12 +2113,10 @@ static void mv_qc_prep(struct ata_queued_cmd *qc) - * non-NCQ mode are: [RW] STREAM DMA and W DMA FUA EXT, none - * of which are defined/used by Linux. If we get here, this - * driver needs work. -- * -- * FIXME: modify libata to give qc_prep a return value and -- * return error here. - */ -- BUG_ON(tf->command); -- break; -+ ata_port_err(ap, "%s: unsupported command: %.2x\n", __func__, -+ tf->command); -+ return AC_ERR_INVALID; - } - mv_crqb_pack_cmd(cw++, tf->nsect, ATA_REG_NSECT, 0); - mv_crqb_pack_cmd(cw++, tf->hob_lbal, ATA_REG_LBAL, 0); --- -2.25.1 - diff --git a/queue-4.4/series b/queue-4.4/series index 5c57d5878d8..648b868cc7e 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -13,7 +13,6 @@ scsi-aacraid-fix-illegal-io-beyond-last-lba.patch m68k-q40-fix-info-leak-in-rtc_ioctl.patch gma-gma500-fix-a-memory-disclosure-bug-due-to-uninit.patch asoc-kirkwood-fix-irq-error-handling.patch -ata-sata_mv-avoid-trigerrable-bug_on.patch pm-devfreq-tegra30-fix-integer-overflow-on-cpu-s-fre.patch mtd-cfi_cmdset_0002-don-t-free-cfi-cfiq-in-error-pat.patch mfd-mfd-core-protect-against-null-call-back-function.patch diff --git a/queue-4.9/ata-sata_mv-avoid-trigerrable-bug_on.patch b/queue-4.9/ata-sata_mv-avoid-trigerrable-bug_on.patch deleted file mode 100644 index 6a2a2f41c09..00000000000 --- a/queue-4.9/ata-sata_mv-avoid-trigerrable-bug_on.patch +++ /dev/null @@ -1,57 +0,0 @@ -From cc18040f7cd32540b8bcc6dcd8e78ef34af267a8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 31 Oct 2019 10:59:46 +0100 -Subject: ata: sata_mv, avoid trigerrable BUG_ON - -From: Jiri Slaby - -[ Upstream commit e9f691d899188679746eeb96e6cb520459eda9b4 ] - -There are several reports that the BUG_ON on unsupported command in -mv_qc_prep can be triggered under some circumstances: -https://bugzilla.suse.com/show_bug.cgi?id=1110252 -https://serverfault.com/questions/888897/raid-problems-after-power-outage -https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1652185 -https://bugs.centos.org/view.php?id=14998 - -Let sata_mv handle the failure gracefully: warn about that incl. the -failed command number and return an AC_ERR_INVALID error. We can do that -now thanks to the previous patch. - -Remove also the long-standing FIXME. - -[v2] use %.2x as commands are defined as hexa. - -Signed-off-by: Jiri Slaby -Cc: Jens Axboe -Cc: linux-ide@vger.kernel.org -Cc: Sergei Shtylyov -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - drivers/ata/sata_mv.c | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c -index 2f32782cea6d9..2ec37a038eda8 100644 ---- a/drivers/ata/sata_mv.c -+++ b/drivers/ata/sata_mv.c -@@ -2111,12 +2111,10 @@ static void mv_qc_prep(struct ata_queued_cmd *qc) - * non-NCQ mode are: [RW] STREAM DMA and W DMA FUA EXT, none - * of which are defined/used by Linux. If we get here, this - * driver needs work. -- * -- * FIXME: modify libata to give qc_prep a return value and -- * return error here. - */ -- BUG_ON(tf->command); -- break; -+ ata_port_err(ap, "%s: unsupported command: %.2x\n", __func__, -+ tf->command); -+ return AC_ERR_INVALID; - } - mv_crqb_pack_cmd(cw++, tf->nsect, ATA_REG_NSECT, 0); - mv_crqb_pack_cmd(cw++, tf->hob_lbal, ATA_REG_LBAL, 0); --- -2.25.1 - diff --git a/queue-4.9/series b/queue-4.9/series index fcf0b0906db..8e492f0c213 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -15,7 +15,6 @@ scsi-aacraid-fix-illegal-io-beyond-last-lba.patch m68k-q40-fix-info-leak-in-rtc_ioctl.patch gma-gma500-fix-a-memory-disclosure-bug-due-to-uninit.patch asoc-kirkwood-fix-irq-error-handling.patch -ata-sata_mv-avoid-trigerrable-bug_on.patch pm-devfreq-tegra30-fix-integer-overflow-on-cpu-s-fre.patch clk-ti-adpll-allocate-room-for-terminating-null.patch mtd-cfi_cmdset_0002-don-t-free-cfi-cfiq-in-error-pat.patch diff --git a/queue-5.4/ata-sata_mv-avoid-trigerrable-bug_on.patch b/queue-5.4/ata-sata_mv-avoid-trigerrable-bug_on.patch deleted file mode 100644 index 39e5ce18be7..00000000000 --- a/queue-5.4/ata-sata_mv-avoid-trigerrable-bug_on.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c58f78654648ca3c4df01bf7c5993556b14e4201 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 31 Oct 2019 10:59:46 +0100 -Subject: ata: sata_mv, avoid trigerrable BUG_ON - -From: Jiri Slaby - -[ Upstream commit e9f691d899188679746eeb96e6cb520459eda9b4 ] - -There are several reports that the BUG_ON on unsupported command in -mv_qc_prep can be triggered under some circumstances: -https://bugzilla.suse.com/show_bug.cgi?id=1110252 -https://serverfault.com/questions/888897/raid-problems-after-power-outage -https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1652185 -https://bugs.centos.org/view.php?id=14998 - -Let sata_mv handle the failure gracefully: warn about that incl. the -failed command number and return an AC_ERR_INVALID error. We can do that -now thanks to the previous patch. - -Remove also the long-standing FIXME. - -[v2] use %.2x as commands are defined as hexa. - -Signed-off-by: Jiri Slaby -Cc: Jens Axboe -Cc: linux-ide@vger.kernel.org -Cc: Sergei Shtylyov -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - drivers/ata/sata_mv.c | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c -index bde695a320973..0229b618d0eee 100644 ---- a/drivers/ata/sata_mv.c -+++ b/drivers/ata/sata_mv.c -@@ -2098,12 +2098,10 @@ static void mv_qc_prep(struct ata_queued_cmd *qc) - * non-NCQ mode are: [RW] STREAM DMA and W DMA FUA EXT, none - * of which are defined/used by Linux. If we get here, this - * driver needs work. -- * -- * FIXME: modify libata to give qc_prep a return value and -- * return error here. - */ -- BUG_ON(tf->command); -- break; -+ ata_port_err(ap, "%s: unsupported command: %.2x\n", __func__, -+ tf->command); -+ return AC_ERR_INVALID; - } - mv_crqb_pack_cmd(cw++, tf->nsect, ATA_REG_NSECT, 0); - mv_crqb_pack_cmd(cw++, tf->hob_lbal, ATA_REG_LBAL, 0); --- -2.25.1 - diff --git a/queue-5.4/series b/queue-5.4/series index f253408b781..31f9aa19938 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -21,7 +21,6 @@ soundwire-intel-cadence-fix-startup-sequence.patch media-smiapp-fix-error-handling-at-nvm-reading.patch drm-amd-display-free-gamma-after-calculating-legacy-.patch xfs-properly-serialise-fallocate-against-aio-dio.patch -ata-sata_mv-avoid-trigerrable-bug_on.patch leds-mlxreg-fix-possible-buffer-overflow.patch dm-table-do-not-allow-request-based-dm-to-stack-on-p.patch pm-devfreq-tegra30-fix-integer-overflow-on-cpu-s-fre.patch -- 2.47.3