summaryrefslogtreecommitdiff
path: root/sys-kernel/hardened-sources/files
diff options
context:
space:
mode:
authorMarcin Deranek <marcin.deranek@slonko.net>2022-10-26 10:49:52 +0200
committerMarcin Deranek <marcin.deranek@slonko.net>2022-10-26 10:49:52 +0200
commit07f0d87bcd067766662b06d93b87d00613d0e016 (patch)
treed987b5f700a7d34aec2288939d256f4be262ea44 /sys-kernel/hardened-sources/files
parentab78ca9e9586e05bf24259b1d0695181cb1c9f9d (diff)
downloadportage-07f0d87bcd067766662b06d93b87d00613d0e016.tar.gz
portage-07f0d87bcd067766662b06d93b87d00613d0e016.tar.bz2
portage-07f0d87bcd067766662b06d93b87d00613d0e016.zip
sys-kernel/hardened-sources 6.0 branch initial support
Diffstat (limited to 'sys-kernel/hardened-sources/files')
-rw-r--r--sys-kernel/hardened-sources/files/9999_revert-conflicts-v3.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/sys-kernel/hardened-sources/files/9999_revert-conflicts-v3.patch b/sys-kernel/hardened-sources/files/9999_revert-conflicts-v3.patch
new file mode 100644
index 0000000..365adfe
--- /dev/null
+++ b/sys-kernel/hardened-sources/files/9999_revert-conflicts-v3.patch
@@ -0,0 +1,13 @@
+Reverse conflicting patches
+
+--- a/mm/Kconfig
++++ b/mm/Kconfig
+@@ -321,8 +321,6 @@ config KSM
+ config DEFAULT_MMAP_MIN_ADDR
+ int "Low address space to protect from user allocation"
+ depends on MMU
+- default 65536 if ( X86_64 || X86_32 || PPC64 || IA64 ) && GENTOO_KERNEL_SELF_PROTECTION
+- default 32768 if ( ARM64 || ARM ) && GENTOO_KERNEL_SELF_PROTECTION
+ default 4096
+ help
+ This is the portion of low virtual memory which should be protected