From acb5c7f74081a3b73b7e81bb942e57dfe9ecf711 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso Date: Tue, 23 Jun 2020 16:45:46 +0200 Subject: [PATCH] Drop "x86/speculation: Add Ivy Bridge to affected list" --- debian/changelog | 1 - ...tion-Add-Ivy-Bridge-to-affected-list.patch | 39 ------------------- debian/patches/series | 1 - 3 files changed, 41 deletions(-) delete mode 100644 debian/patches/bugfix/x86/srbds/0005-x86-speculation-Add-Ivy-Bridge-to-affected-list.patch diff --git a/debian/changelog b/debian/changelog index c4b68d255..ebfd24853 100644 --- a/debian/changelog +++ b/debian/changelog @@ -480,7 +480,6 @@ linux (4.19.128-1) UNRELEASED; urgency=medium - staging: rtl8712: Fix IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK - CDC-ACM: heed quirk also in error handling - nvmem: qfprom: remove incorrect write support - - x86/speculation: Add Ivy Bridge to affected list - uprobes: ensure that uprobe->offset and ->ref_ctr_offset are properly aligned - Revert "net/mlx5: Annotate mutex destroy for root ns" diff --git a/debian/patches/bugfix/x86/srbds/0005-x86-speculation-Add-Ivy-Bridge-to-affected-list.patch b/debian/patches/bugfix/x86/srbds/0005-x86-speculation-Add-Ivy-Bridge-to-affected-list.patch deleted file mode 100644 index 42bd1823f..000000000 --- a/debian/patches/bugfix/x86/srbds/0005-x86-speculation-Add-Ivy-Bridge-to-affected-list.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Josh Poimboeuf -Date: Mon, 27 Apr 2020 20:46:13 +0200 -Subject: [5/5] x86/speculation: Add Ivy Bridge to affected list -Origin: https://git.kernel.org/linus/3798cc4d106e91382bfe016caa2edada27c2bb3f -Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2020-0543 - -Make the docs match the code. - -Signed-off-by: Josh Poimboeuf -Signed-off-by: Thomas Gleixner ---- - .../hw-vuln/special-register-buffer-data-sampling.rst | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/Documentation/admin-guide/hw-vuln/special-register-buffer-data-sampling.rst b/Documentation/admin-guide/hw-vuln/special-register-buffer-data-sampling.rst -index 6a473da80b62..47b1b3afac99 100644 ---- a/Documentation/admin-guide/hw-vuln/special-register-buffer-data-sampling.rst -+++ b/Documentation/admin-guide/hw-vuln/special-register-buffer-data-sampling.rst -@@ -27,6 +27,8 @@ by software using TSX_CTRL_MSR otherwise they are not affected. - ============= ============ ======== - common name Family_Model Stepping - ============= ============ ======== -+ IvyBridge 06_3AH All -+ - Haswell 06_3CH All - Haswell_L 06_45H All - Haswell_G 06_46H All -@@ -37,9 +39,8 @@ by software using TSX_CTRL_MSR otherwise they are not affected. - Skylake_L 06_4EH All - Skylake 06_5EH All - -- Kabylake_L 06_8EH <=0xC -- -- Kabylake 06_9EH <=0xD -+ Kabylake_L 06_8EH <= 0xC -+ Kabylake 06_9EH <= 0xD - ============= ============ ======== - - Related CVEs diff --git a/debian/patches/series b/debian/patches/series index 7275f8125..95f4f0333 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -296,7 +296,6 @@ features/arm/staging-vc04_services-Use-correct-cache-line-size.patch # Security fixes debian/i386-686-pae-pci-set-pci-nobios-by-default.patch debian/ntfs-mark-it-as-broken.patch -bugfix/x86/srbds/0005-x86-speculation-Add-Ivy-Bridge-to-affected-list.patch # ABI maintenance debian/abi/x86-speculation-do-not-match-steppings.patch