Update config files.

Turn off CONFIG_HARDENED_USERCOPY as it causes issues on s390 (bnc#1156053). Until this gets resolved upstream...
openSUSE · Jan 3, 2020 · 34be040 · 34be040
1 parent 7e31c5e
commit 34be040
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/config/s390x/default b/config/s390x/default
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.5.0-rc3 Kernel Configuration
+# Linux/s390 5.5.0-rc4 Kernel Configuration
 #
 
 #
@@ -3577,9 +3577,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_PATH=y
 CONFIG_LSM_MMAP_MIN_ADDR=0
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HARDENED_USERCOPY=y
-# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+# CONFIG_HARDENED_USERCOPY is not set
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
 CONFIG_SECURITY_SELINUX=y

diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.5.0-rc3 Kernel Configuration
+# Linux/s390 5.5.0-rc4 Kernel Configuration
 #
 
 #
@@ -1196,8 +1196,7 @@ CONFIG_IO_WQ=y
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HARDENED_USERCOPY=y
-# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
+# CONFIG_HARDENED_USERCOPY is not set
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
 CONFIG_DEFAULT_SECURITY_DAC=y