summaryrefslogtreecommitdiff
path: root/sys-kernel/hardened-sources/files/9999_revert-conflicts-v3.patch
diff options
context:
space:
mode:
Diffstat (limited to 'sys-kernel/hardened-sources/files/9999_revert-conflicts-v3.patch')
-rw-r--r--sys-kernel/hardened-sources/files/9999_revert-conflicts-v3.patch23
1 files changed, 0 insertions, 23 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
deleted file mode 100644
index edbc98e..0000000
--- a/sys-kernel/hardened-sources/files/9999_revert-conflicts-v3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
---- a/security/Kconfig
-+++ b/security/Kconfig
-@@ -167,7 +167,6 @@ config HARDENED_USERCOPY_PAGESPAN
- bool "Refuse to copy allocations that span multiple pages"
- depends on HARDENED_USERCOPY
- depends on BROKEN
-- depends on !GENTOO_KERNEL_SELF_PROTECTION
- help
- When a multi-page allocation is done without __GFP_COMP,
- hardened usercopy will reject attempts to copy it. There are,