4.14-stable patches

added patches:
	x86-pkey-fix-undefined-behaviour-with-pkru_wd_bit.patch

diff --git a/queue-4.14/series b/queue-4.14/series
index d90f4b4e2dee04652ae78d785736395468757049..82786f250f68cd2c5792db6c21412feb1ff80fd5 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -15,3 +15,4 @@ hwmon-lm90-fix-usage-of-config2-register-in-detect-f.patch
 alsa-jack-check-the-return-value-of-kstrdup.patch
 alsa-drivers-opl3-fix-incorrect-use-of-vp-state.patch
 input-atmel_mxt_ts-fix-double-free-in-mxt_read_info_block.patch
+x86-pkey-fix-undefined-behaviour-with-pkru_wd_bit.patch

diff --git a/queue-4.14/x86-pkey-fix-undefined-behaviour-with-pkru_wd_bit.patch b/queue-4.14/x86-pkey-fix-undefined-behaviour-with-pkru_wd_bit.patch
new file mode 100644 (file)
index 0000000..36a5d8d
--- /dev/null
+++ b/queue-4.14/x86-pkey-fix-undefined-behaviour-with-pkru_wd_bit.patch
@@ -0,0 +1,52 @@
+From 57690554abe135fee81d6ac33cc94d75a7e224bb Mon Sep 17 00:00:00 2001
+From: Andrew Cooper <andrew.cooper3@citrix.com>
+Date: Thu, 16 Dec 2021 00:08:56 +0000
+Subject: x86/pkey: Fix undefined behaviour with PKRU_WD_BIT
+
+From: Andrew Cooper <andrew.cooper3@citrix.com>
+
+commit 57690554abe135fee81d6ac33cc94d75a7e224bb upstream.
+
+Both __pkru_allows_write() and arch_set_user_pkey_access() shift
+PKRU_WD_BIT (a signed constant) by up to 30 bits, hitting the
+sign bit.
+
+Use unsigned constants instead.
+
+Clearly pkey 15 has not been used in combination with UBSAN yet.
+
+Noticed by code inspection only.  I can't actually provoke the
+compiler into generating incorrect logic as far as this shift is
+concerned.
+
+[
+  dhansen: add stable@ tag, plus minor changelog massaging,
+
+           For anyone doing backports, these #defines were in
+          arch/x86/include/asm/pgtable.h before 784a46618f6.
+]
+
+Fixes: 33a709b25a76 ("mm/gup, x86/mm/pkeys: Check VMAs and PTEs for protection keys")
+Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
+Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
+Signed-off-by: Borislav Petkov <bp@suse.de>
+Cc: stable@vger.kernel.org
+Link: https://lkml.kernel.org/r/20211216000856.4480-1-andrew.cooper3@citrix.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/include/asm/pgtable.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/x86/include/asm/pgtable.h
++++ b/arch/x86/include/asm/pgtable.h
+@@ -1220,8 +1220,8 @@ static inline pmd_t pmd_swp_clear_soft_d
+ #endif
+ #endif
+ 
+-#define PKRU_AD_BIT 0x1
+-#define PKRU_WD_BIT 0x2
++#define PKRU_AD_BIT 0x1u
++#define PKRU_WD_BIT 0x2u
+ #define PKRU_BITS_PER_PKEY 2
+ 
+ static inline bool __pkru_allows_read(u32 pkru, u16 pkey)