summaryrefslogtreecommitdiff
path: root/sys-kernel/hardened-sources/files/linux-hardened-gentoo.patch
diff options
context:
space:
mode:
authorMarcin Deranek <marcin.deranek@slonko.net>2021-06-18 12:42:55 +0200
committerMarcin Deranek <marcin.deranek@slonko.net>2021-06-18 12:42:55 +0200
commitc5a2aece1a46ff4e57886ab5b5351995cf493e6c (patch)
tree2c29b1f5d4f6791a5ef88de974eeca1353f02a05 /sys-kernel/hardened-sources/files/linux-hardened-gentoo.patch
parent66429900e4f73eec6713a0193db2706bb1481c7f (diff)
downloadportage-c5a2aece1a46ff4e57886ab5b5351995cf493e6c.tar.gz
portage-c5a2aece1a46ff4e57886ab5b5351995cf493e6c.tar.bz2
portage-c5a2aece1a46ff4e57886ab5b5351995cf493e6c.zip
hardened-sources version bump
Added a few patches to accomodate for conflicting changes between Gentoo and linux-hardened. First we revert conflicting changes (9999_revert-conflicts.patch) and re-apply relevant changes with slightly modified patch (linux-hardened-gentoo.patch).
Diffstat (limited to 'sys-kernel/hardened-sources/files/linux-hardened-gentoo.patch')
-rw-r--r--sys-kernel/hardened-sources/files/linux-hardened-gentoo.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/sys-kernel/hardened-sources/files/linux-hardened-gentoo.patch b/sys-kernel/hardened-sources/files/linux-hardened-gentoo.patch
new file mode 100644
index 0000000..5bd9820
--- /dev/null
+++ b/sys-kernel/hardened-sources/files/linux-hardened-gentoo.patch
@@ -0,0 +1,11 @@
+diff --git a/security/Kconfig b/security/Kconfig
+index 7561f6f99..01f0bf73f 100644
+--- a/security/Kconfig
++++ b/security/Kconfig
+@@ -166,5 +166,6 @@ config HARDENED_USERCOPY
+ config HARDENED_USERCOPY_FALLBACK
+ bool "Allow usercopy whitelist violations to fallback to object size"
+ depends on HARDENED_USERCOPY
++ depends on !GENTOO_KERNEL_SELF_PROTECTION
+ help
+ This is a temporary option that allows missing usercopy whitelists