Sync with linux-hardened-4.14.12.-1

6 files changed, 57 insertions, 108 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2aa5e9e48fac..79fd3051fdc5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-hardened-apparmor
-	pkgver = 4.14.11.a
+	pkgver = 4.14.12.a
 	pkgrel = 1
 	url = https://github.com/copperhead/linux-hardened
 	arch = x86_64
@@ -14,19 +14,18 @@ pkgbase = linux-hardened-apparmor
 	options = !strip
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.sign
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.11.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.11.sign
-	source = https://github.com/thestinger/linux-hardened/releases/download/4.14.11.a/linux-hardened-4.14.11.a.patch
-	source = https://github.com/thestinger/linux-hardened/releases/download/4.14.11.a/linux-hardened-4.14.11.a.patch.sig
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.12.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.12.sign
+	source = https://github.com/thestinger/linux-hardened/releases/download/4.14.12.a/linux-hardened-4.14.12.a.patch
+	source = https://github.com/thestinger/linux-hardened/releases/download/4.14.12.a/linux-hardened-4.14.12.a.patch.sig
 	source = config.x86_64
 	source = 60-linux.hook
 	source = 90-linux.hook
 	source = linux.preset
 	source = e1000e-Fix-e1000_check_for_copper_link_ich8lan-retur.patch
-	source = Revert-xfrm-Fix-stack-out-of-bounds-read-in-xfrm_state_find.patch
 	source = xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-lookup.patch
 	source = cgroup-fix-css_task_iter-crash-on-CSS_TASK_ITER_PROC.patch
-	source = x86-cpu-x86-pti-Do-not-enable-PTI-on-AMD-processors.patch
+	source = drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch
 	source = CVE-2017-8824-dccp-use-after-free-in-DCCP-code.patch
 	source = CVE-2017-17448-netfilter-nfnetlink_cthelper-Add-missing-permission-checks.patch
 	source = CVE-2017-17450-netfilter-xt_osf-Add-missing-permission-checks.patch
@@ -36,19 +35,18 @@ pkgbase = linux-hardened-apparmor
 	validpgpkeys = 65EEFE022108E2B708CBFCF7F9E712E59AF5F22A
 	sha256sums = f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7
 	sha256sums = SKIP
-	sha256sums = f588b62d7ee1d2ebdc24afa0e256ff2f8812d5cab3bf572bf02e7c4525922bf9
+	sha256sums = da5d8db44b0988e4c45346899d3f5a51f8bd6c25f14e729615ca9ff9f17bdefd
 	sha256sums = SKIP
-	sha256sums = 7bf093ee625cf97560bb57b01fc7ddb1bfb705377cc6b68994911cceb23126d5
+	sha256sums = 199ac6bc8644677dc801dae69c4293d4cef100696f2d1c60a4bc5faaa4d896e8
 	sha256sums = SKIP
-	sha256sums = 152d0e8cb3971f651357f209c03f697bd4e484d5fcc38bd2611d115124d8b425
+	sha256sums = 7dfbc037dc5cd334a8450742dbe73eb0c8314100463b645a5e2cdffe3e8ddd1a
 	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
 	sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
 	sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
 	sha256sums = c6e7db7dfd6a07e1fd0e20c3a5f0f315f9c2a366fe42214918b756f9a1c9bfa3
-	sha256sums = f7c86f7aa4c7d671a5ff80bcd92a33db2fa6e95b78188261db0ef260a7d75cd8
 	sha256sums = 294c928b8252112d621df1d13fbfeade13f28ddea034d44e89db41b66d2b7d45
 	sha256sums = 721c387db986d883a6df6b0da17941ce6d59811b0647ae6653b978c5ee144f19
-	sha256sums = 086f6ab16a6894db5444007d195f779322f3a5792e7ca0e91a61d4e633ad8f26
+	sha256sums = c08d12c699398ef88b764be1837b9ee11f2efd3188bd1bf4e8f85dfbeee58148
 	sha256sums = 6be803c62b7ce41f1b4de6c867715398812b1c1a3e68a0078512f2872e2a3fa9
 	sha256sums = b833ad4354fcd2cc6ee60c971088f77aa5b06a58fce346c40268c0b05b1e8cb5
 	sha256sums = 72efa781c8ee1175a8865e6a12568aaf3bac4b76d4285819c6a75a3e5fe41435
diff --git a/PKGBUILD b/PKGBUILD
index 637ce53024ce..c1bdb0dd8fe8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=linux-hardened-apparmor
 _srcname=linux-4.14
-_pkgver=4.14.11
+_pkgver=4.14.12
 pkgver=${_pkgver}.a
 pkgrel=1
 url='https://github.com/copperhead/linux-hardened'
@@ -23,12 +23,11 @@ source=(https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz
         # https://bugs.archlinux.org/task/56575
         e1000e-Fix-e1000_check_for_copper_link_ich8lan-retur.patch
         # https://bugs.archlinux.org/task/56605
-        Revert-xfrm-Fix-stack-out-of-bounds-read-in-xfrm_state_find.patch
         xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-lookup.patch
         # https://bugs.archlinux.org/task/56846
         cgroup-fix-css_task_iter-crash-on-CSS_TASK_ITER_PROC.patch
-
-        x86-cpu-x86-pti-Do-not-enable-PTI-on-AMD-processors.patch
+        # https://bugs.archlinux.org/task/56711
+        drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch
 
         CVE-2017-8824-dccp-use-after-free-in-DCCP-code.patch
         CVE-2017-17448-netfilter-nfnetlink_cthelper-Add-missing-permission-checks.patch
@@ -38,19 +37,18 @@ source=(https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz
 replaces=('linux-grsec')
 sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7'
             'SKIP'
-            'f588b62d7ee1d2ebdc24afa0e256ff2f8812d5cab3bf572bf02e7c4525922bf9'
+            'da5d8db44b0988e4c45346899d3f5a51f8bd6c25f14e729615ca9ff9f17bdefd'
             'SKIP'
-            '7bf093ee625cf97560bb57b01fc7ddb1bfb705377cc6b68994911cceb23126d5'
+            '199ac6bc8644677dc801dae69c4293d4cef100696f2d1c60a4bc5faaa4d896e8'
             'SKIP'
-            '152d0e8cb3971f651357f209c03f697bd4e484d5fcc38bd2611d115124d8b425'
+            '7dfbc037dc5cd334a8450742dbe73eb0c8314100463b645a5e2cdffe3e8ddd1a'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
             'c6e7db7dfd6a07e1fd0e20c3a5f0f315f9c2a366fe42214918b756f9a1c9bfa3'
-            'f7c86f7aa4c7d671a5ff80bcd92a33db2fa6e95b78188261db0ef260a7d75cd8'
             '294c928b8252112d621df1d13fbfeade13f28ddea034d44e89db41b66d2b7d45'
             '721c387db986d883a6df6b0da17941ce6d59811b0647ae6653b978c5ee144f19'
-            '086f6ab16a6894db5444007d195f779322f3a5792e7ca0e91a61d4e633ad8f26'
+            'c08d12c699398ef88b764be1837b9ee11f2efd3188bd1bf4e8f85dfbeee58148'
             '6be803c62b7ce41f1b4de6c867715398812b1c1a3e68a0078512f2872e2a3fa9'
             'b833ad4354fcd2cc6ee60c971088f77aa5b06a58fce346c40268c0b05b1e8cb5'
             '72efa781c8ee1175a8865e6a12568aaf3bac4b76d4285819c6a75a3e5fe41435'
diff --git a/Revert-xfrm-Fix-stack-out-of-bounds-read-in-xfrm_state_find.patch b/Revert-xfrm-Fix-stack-out-of-bounds-read-in-xfrm_state_find.patch
deleted file mode 100644
index f0147a5c003a..000000000000
--- a/Revert-xfrm-Fix-stack-out-of-bounds-read-in-xfrm_state_find.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 94802151894d482e82c324edf2c658f8e6b96508 Mon Sep 17 00:00:00 2001
-From: Steffen Klassert <steffen.klassert@secunet.com>
-Date: Wed, 15 Nov 2017 06:40:57 +0100
-Subject: [PATCH] Revert "xfrm: Fix stack-out-of-bounds read in
- xfrm_state_find."
-
-This reverts commit c9f3f813d462c72dbe412cee6a5cbacf13c4ad5e.
-
-This commit breaks transport mode when the policy template
-has widlcard addresses configured, so revert it.
-
-Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
----
- net/xfrm/xfrm_policy.c | 29 ++++++++++++++++++-----------
- 1 file changed, 18 insertions(+), 11 deletions(-)
-
-diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
-index 2a6093840e7e..6bc16bb61b55 100644
---- a/net/xfrm/xfrm_policy.c
-+++ b/net/xfrm/xfrm_policy.c
-@@ -1362,29 +1362,36 @@ xfrm_tmpl_resolve_one(struct xfrm_policy *policy, const struct flowi *fl,
- 	struct net *net = xp_net(policy);
- 	int nx;
- 	int i, error;
-+	xfrm_address_t *daddr = xfrm_flowi_daddr(fl, family);
-+	xfrm_address_t *saddr = xfrm_flowi_saddr(fl, family);
- 	xfrm_address_t tmp;
- 
- 	for (nx = 0, i = 0; i < policy->xfrm_nr; i++) {
- 		struct xfrm_state *x;
--		xfrm_address_t *local;
--		xfrm_address_t *remote;
-+		xfrm_address_t *remote = daddr;
-+		xfrm_address_t *local  = saddr;
- 		struct xfrm_tmpl *tmpl = &policy->xfrm_vec[i];
- 
--		remote = &tmpl->id.daddr;
--		local = &tmpl->saddr;
--		if (xfrm_addr_any(local, tmpl->encap_family)) {
--			error = xfrm_get_saddr(net, fl->flowi_oif,
--					       &tmp, remote,
--					       tmpl->encap_family, 0);
--			if (error)
--				goto fail;
--			local = &tmp;
-+		if (tmpl->mode == XFRM_MODE_TUNNEL ||
-+		    tmpl->mode == XFRM_MODE_BEET) {
-+			remote = &tmpl->id.daddr;
-+			local = &tmpl->saddr;
-+			if (xfrm_addr_any(local, tmpl->encap_family)) {
-+				error = xfrm_get_saddr(net, fl->flowi_oif,
-+						       &tmp, remote,
-+						       tmpl->encap_family, 0);
-+				if (error)
-+					goto fail;
-+				local = &tmp;
-+			}
- 		}
- 
- 		x = xfrm_state_find(remote, local, fl, tmpl, policy, &error, family);
- 
- 		if (x && x->km.state == XFRM_STATE_VALID) {
- 			xfrm[nx++] = x;
-+			daddr = remote;
-+			saddr = local;
- 			continue;
- 		}
- 		if (x) {
--- 
-2.15.1
-
diff --git a/config.x86_64 b/config.x86_64
index fb44def9d523..5c261fed7a5d 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.11 Kernel Configuration
+# Linux/x86 4.14.12 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
diff --git a/drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch b/drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch
new file mode 100644
index 000000000000..64212063aead
--- /dev/null
+++ b/drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch
@@ -0,0 +1,39 @@
+From e9b8250407ae73faa7ac543f7f260b4b2f34ebd8 Mon Sep 17 00:00:00 2001
+From: Jim Bride <jim.bride@linux.intel.com>
+Date: Mon, 6 Nov 2017 13:38:57 -0800
+Subject: [PATCH] drm/i915/edp: Only use the alternate fixed mode if it's asked
+ for
+
+In commit dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for
+eDP if available."), the patch allows for the use of an alternate fixed
+mode if it is available, but the patch was not ensuring that the only
+time the alternate mode is used is when it is specifically requested.
+This patch adds an additional comparison to intel_edp_compare_alt_mode
+to ensure that we only use the alternate mode if it is directly
+requested.
+
+Fixes: dc911f5bd8aac ("Allow alternate fixed mode for eDP if available.")
+Cc: David Weinehall <david.weinehall@linux.intel.com>
+Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Signed-off-by: Jim Bride <jim.bride@linux.intel.com>
+---
+ drivers/gpu/drm/i915/intel_dp.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
+index d27c014..8164c59 100644
+--- a/drivers/gpu/drm/i915/intel_dp.c
++++ b/drivers/gpu/drm/i915/intel_dp.c
+@@ -1621,7 +1621,8 @@ static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1,
+ 			m1->vdisplay == m2->vdisplay &&
+ 			m1->vsync_start == m2->vsync_start &&
+ 			m1->vsync_end == m2->vsync_end &&
+-			m1->vtotal == m2->vtotal);
++			m1->vtotal == m2->vtotal &&
++			m1->vrefresh == m2->vrefresh);
+ 	return bres;
+ }
+ 
+-- 
+2.7.4
+
diff --git a/x86-cpu-x86-pti-Do-not-enable-PTI-on-AMD-processors.patch b/x86-cpu-x86-pti-Do-not-enable-PTI-on-AMD-processors.patch
deleted file mode 100644
index d6ac8b188657..000000000000
--- a/x86-cpu-x86-pti-Do-not-enable-PTI-on-AMD-processors.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index c47de4e..7d9e3b0 100644
---- a/arch/x86/kernel/cpu/common.c
-+++ b/arch/x86/kernel/cpu/common.c
-@@ -923,8 +923,8 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
- 
- 	setup_force_cpu_cap(X86_FEATURE_ALWAYS);
- 
--	/* Assume for now that ALL x86 CPUs are insecure */
--	setup_force_cpu_bug(X86_BUG_CPU_INSECURE);
-+	if (c->x86_vendor != X86_VENDOR_AMD)
-+		setup_force_cpu_bug(X86_BUG_CPU_INSECURE);
- 
- 	fpu__init_system(c);
-