diff options
Diffstat (limited to 'sys-kernel/hardened-sources/files')
4 files changed, 2 insertions, 35 deletions
diff --git a/sys-kernel/hardened-sources/files/9999_revert-conflicts-v2.patch b/sys-kernel/hardened-sources/files/9999_revert-conflicts-v2.patch index fabe571..edbc98e 100644 --- a/sys-kernel/hardened-sources/files/9999_revert-conflicts-v2.patch +++ b/sys-kernel/hardened-sources/files/9999_revert-conflicts-v2.patch @@ -16,7 +16,7 @@ Reverse conflicting patches @@ -167,7 +167,6 @@ config HARDENED_USERCOPY_PAGESPAN bool "Refuse to copy allocations that span multiple pages" depends on HARDENED_USERCOPY - depends on EXPERT + depends on BROKEN - depends on !GENTOO_KERNEL_SELF_PROTECTION help When a multi-page allocation is done without __GFP_COMP, 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, diff --git a/sys-kernel/hardened-sources/files/linux-hardened-gentoo-v2.patch b/sys-kernel/hardened-sources/files/linux-hardened-gentoo-v2.patch index 6e32cd1..f2c2c27 100644 --- a/sys-kernel/hardened-sources/files/linux-hardened-gentoo-v2.patch +++ b/sys-kernel/hardened-sources/files/linux-hardened-gentoo-v2.patch @@ -3,7 +3,7 @@ @@ -167,6 +167,7 @@ config HARDENED_USERCOPY_PAGESPAN bool "Refuse to copy allocations that span multiple pages" depends on HARDENED_USERCOPY - depends on EXPERT + depends on BROKEN + depends on !GENTOO_KERNEL_SELF_PROTECTION help When a multi-page allocation is done without __GFP_COMP, diff --git a/sys-kernel/hardened-sources/files/linux-hardened-gentoo-v3.patch b/sys-kernel/hardened-sources/files/linux-hardened-gentoo-v3.patch deleted file mode 100644 index f2c2c27..0000000 --- a/sys-kernel/hardened-sources/files/linux-hardened-gentoo-v3.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/security/Kconfig 2021-12-05 18:20:55.655677710 -0500 -+++ b/security/Kconfig 2021-12-05 18:23:42.404251618 -0500 -@@ -167,6 +167,7 @@ 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, |