From 19eb7a75556a4e124cc24b404450febfec358854 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Tue, 5 May 2015 09:59:22 -0400 Subject: [PATCH] Backport patch to blacklist TRIM on all Samsung 8xx series SSDs (rhbz 1218662) --- kernel.spec | 7 ++++ ...-queued-TRIM-on-all-Samsung-800-seri.patch | 39 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 libata-Blacklist-queued-TRIM-on-all-Samsung-800-seri.patch diff --git a/kernel.spec b/kernel.spec index 9e1c04286..61879d1c9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -781,6 +781,9 @@ Patch26193: toshiba_acpi-Do-not-register-vendor-backlight-when-a.patch #CVE-2015-3636 rhbz 1218074 1218110 Patch26194: ipv4-Missing-sk_nulls_node_init-in-ping_unhash.patch +#rhbz 1218662 +Patch26199: libata-Blacklist-queued-TRIM-on-all-Samsung-800-seri.patch + # END OF PATCH DEFINITIONS %endif @@ -1531,6 +1534,9 @@ ApplyPatch toshiba_acpi-Do-not-register-vendor-backlight-when-a.patch #CVE-2015-3636 rhbz 1218074 1218110 ApplyPatch ipv4-Missing-sk_nulls_node_init-in-ping_unhash.patch +#rhbz 1218662 +ApplyPatch libata-Blacklist-queued-TRIM-on-all-Samsung-800-seri.patch + # END OF PATCH APPLICATIONS %endif @@ -2343,6 +2349,7 @@ fi # || || %changelog * Tue May 05 2015 Josh Boyer +- Backport patch to blacklist TRIM on all Samsung 8xx series SSDs (rhbz 1218662) - CVE-2015-3636 ping-sockets use-after-free privilege escalation (rhbz 1218074 1218110) * Thu Apr 30 2015 Laura Abbott - 3.19.6-100 diff --git a/libata-Blacklist-queued-TRIM-on-all-Samsung-800-seri.patch b/libata-Blacklist-queued-TRIM-on-all-Samsung-800-seri.patch new file mode 100644 index 000000000..ab51df4cd --- /dev/null +++ b/libata-Blacklist-queued-TRIM-on-all-Samsung-800-seri.patch @@ -0,0 +1,39 @@ +From: "Martin K. Petersen" +Date: Mon, 4 May 2015 12:20:29 -0400 +Subject: [PATCH] libata: Blacklist queued TRIM on all Samsung 800-series +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The queued TRIM problems appear to be generic to Samsung's firmware and +not tied to a particular model. A recent update to the 840 EVO firmware +introduced the same issue as we saw on 850 Pro. + +Blacklist queued TRIM on all 800-series drives while we work this issue +with Samsung. + +Reported-by: Günter Waller +Reported-by: Sven Köhler +Signed-off-by: Martin K. Petersen +Cc: stable@vger.kernel.org +Signed-off-by: Tejun Heo +--- + drivers/ata/libata-core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c +index 00f2f740b425..eabee5ec901f 100644 +--- a/drivers/ata/libata-core.c ++++ b/drivers/ata/libata-core.c +@@ -4243,7 +4243,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { + ATA_HORKAGE_ZERO_AFTER_TRIM, }, + { "Crucial_CT*MX100*", "MU01", ATA_HORKAGE_NO_NCQ_TRIM | + ATA_HORKAGE_ZERO_AFTER_TRIM, }, +- { "Samsung SSD 850 PRO*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | ++ { "Samsung SSD 8*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | + ATA_HORKAGE_ZERO_AFTER_TRIM, }, + + /* +-- +2.3.6 +