diff options
| author | Marcin Deranek <marcin.deranek@slonko.net> | 2022-06-10 09:59:59 +0200 |
|---|---|---|
| committer | Marcin Deranek <marcin.deranek@slonko.net> | 2022-06-10 09:59:59 +0200 |
| commit | d3e49e18bd7cad0ff7b5773cd032ea97172c797d (patch) | |
| tree | 67b922cd98c4d93283366b4d4a99383d3ade2e9e /sys-kernel/hardened-sources/files | |
| parent | 56af6097e249557b5935abceeb208bfcd0be14eb (diff) | |
| download | portage-d3e49e18bd7cad0ff7b5773cd032ea97172c797d.tar.gz portage-d3e49e18bd7cad0ff7b5773cd032ea97172c797d.tar.bz2 portage-d3e49e18bd7cad0ff7b5773cd032ea97172c797d.zip | |
hardened-sources/hardened-sources version bumps
Diffstat (limited to 'sys-kernel/hardened-sources/files')
| -rw-r--r-- | sys-kernel/hardened-sources/files/9999_revert-conflicts-v3.patch | 23 | ||||
| -rw-r--r-- | sys-kernel/hardened-sources/files/linux-hardened-gentoo-v3.patch | 10 |
2 files changed, 33 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..edbc98e --- /dev/null +++ b/sys-kernel/hardened-sources/files/9999_revert-conflicts-v3.patch @@ -0,0 +1,23 @@ +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-v3.patch b/sys-kernel/hardened-sources/files/linux-hardened-gentoo-v3.patch new file mode 100644 index 0000000..f2c2c27 --- /dev/null +++ b/sys-kernel/hardened-sources/files/linux-hardened-gentoo-v3.patch @@ -0,0 +1,10 @@ +--- 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, |