Linux v5.3.11

9 files changed, 24 insertions, 2 deletions

diff --git a/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_AUTO b/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_AUTO
new file mode 100644
index 000000000..788136fc5
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_AUTO
@@ -0,0 +1 @@
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
diff --git a/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_OFF b/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_OFF
new file mode 100644
index 000000000..d22a12f0d
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_OFF
@@ -0,0 +1 @@
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
diff --git a/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_ON b/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_ON
new file mode 100644
index 000000000..b6471915c
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_ON
@@ -0,0 +1 @@
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index eae208300..95884ea08 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -6561,6 +6561,9 @@ CONFIG_X86_INTEL_LPSS=y
 CONFIG_X86_INTEL_MPX=y
 CONFIG_X86_INTEL_PSTATE=y
 # CONFIG_X86_INTEL_QUARK is not set
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
 # CONFIG_X86_LEGACY_VM86 is not set
 # CONFIG_X86_LONGHAUL is not set
 CONFIG_X86_LONGRUN=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 61869e292..a89417761 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -6540,6 +6540,9 @@ CONFIG_X86_INTEL_LPSS=y
 CONFIG_X86_INTEL_MPX=y
 CONFIG_X86_INTEL_PSTATE=y
 # CONFIG_X86_INTEL_QUARK is not set
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
 # CONFIG_X86_LEGACY_VM86 is not set
 # CONFIG_X86_LONGHAUL is not set
 CONFIG_X86_LONGRUN=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 1e7e74847..132d17a99 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -6618,6 +6618,9 @@ CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 # CONFIG_X86_INTEL_MID is not set
 CONFIG_X86_INTEL_MPX=y
 CONFIG_X86_INTEL_PSTATE=y
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
 # CONFIG_X86_LEGACY_VM86 is not set
 CONFIG_X86_MCE_AMD=y
 CONFIG_X86_MCE_INJECT=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index bc866f8ad..115df0c07 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -6597,6 +6597,9 @@ CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 # CONFIG_X86_INTEL_MID is not set
 CONFIG_X86_INTEL_MPX=y
 CONFIG_X86_INTEL_PSTATE=y
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
 # CONFIG_X86_LEGACY_VM86 is not set
 CONFIG_X86_MCE_AMD=y
 CONFIG_X86_MCE_INJECT=m
diff --git a/kernel.spec b/kernel.spec
index 5b57502d3..b84d0332e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -56,7 +56,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 10
+%define stable_update 11
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -1826,6 +1826,13 @@ fi
 #
 #
 %changelog
+* Tue Nov 12 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.3.11-200
+- Linux v5.3.11
+- Fixes CVE-2019-11135  (rhbz 1753062 1771649)
+- Fixes CVE-2018-12207  (rhbz 1646768 1771645)
+- Fixes CVE-2019-0154   (rhbz 1724393 1771642)
+- Fixes CVE-2019-0155   (rhbz 1724398 1771644)
+
 * Mon Nov 11 2019 Laura Abbott <labbott@redhat.com> - 5.3.10-200
 - Linux v5.3.10
 
diff --git a/sources b/sources
index 3d7c84282..5e1166799 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
-SHA512 (patch-5.3.10.xz) = cc086c1c2aa68fa751dbcabd0a762d18d7de10e763aaa12b6f88d02585451e6ab2fea9f3bf841f14e8f9ae2dc2cb0ec6a9fdf65309318df8c6c43ada3f70c718
+SHA512 (patch-5.3.11.xz) = 27f6974d008c874bba700cb6f4b70838fdd5bc6cd85340f596663752a7046e3e844e7c50516d3ed7f736e258007e6091c387a989a22eed8170bfd99710f59f52