[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e4d1f968695b6f8d020cd8bf5a650402a61d46ad

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e4d1f968695b6f8d020cd8bf5a650402a61d46ad

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 2581 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  e4d1f968695b6f8d020cd8bf5a650402a61d46ad (commit)
      from  7617da3bba48d40284c2fd93d0265a0bce64aed0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e4d1f968695b6f8d020cd8bf5a650402a61d46ad
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Jun 7 16:37:04 2020 +0000

    kernel: enable CONFIG_HARDENED_USERCOPY on aarch64 and armv5tel
    
    Fixes: #12365
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/kernel/kernel.config.aarch64-ipfire        | 3 ++-
 config/kernel/kernel.config.armv5tel-ipfire-multi | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index 8e4f650a5..e0f2f6df8 100644
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -6541,7 +6541,8 @@ CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 # CONFIG_SECURITY_PATH is not set
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-# CONFIG_HARDENED_USERCOPY is not set
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY_PAGESPAN=y
 # CONFIG_FORTIFY_SOURCE is not set
 # CONFIG_STATIC_USERMODEHELPER is not set
 # CONFIG_SECURITY_SMACK is not set
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi
index ee63c2392..15183300f 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -7024,7 +7024,8 @@ CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 # CONFIG_SECURITY_PATH is not set
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-# CONFIG_HARDENED_USERCOPY is not set
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY_PAGESPAN=y
 # CONFIG_STATIC_USERMODEHELPER is not set
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set


hooks/post-receive
--
IPFire 2.x development tree