diff options
| author | Marcin Deranek <marcin.deranek@slonko.net> | 2022-03-25 19:11:47 +0100 |
|---|---|---|
| committer | Marcin Deranek <marcin.deranek@slonko.net> | 2022-03-25 20:06:52 +0100 |
| commit | e60feda2fa2454e00dd01f51d5ec3473bcb2ce61 (patch) | |
| tree | 758ad6614fd80b67efe9750de678752231e62d26 /sys-kernel/hardened-sources/files | |
| parent | efebf8305cffed000124a2f1d5026f1bea2afd0a (diff) | |
| download | portage-e60feda2fa2454e00dd01f51d5ec3473bcb2ce61.tar.gz portage-e60feda2fa2454e00dd01f51d5ec3473bcb2ce61.tar.bz2 portage-e60feda2fa2454e00dd01f51d5ec3473bcb2ce61.zip | |
sys-kernel/hardened-sources added 5.16 branch
Diffstat (limited to 'sys-kernel/hardened-sources/files')
| -rw-r--r-- | sys-kernel/hardened-sources/files/9999_revert-conflicts-v1.patch (renamed from sys-kernel/hardened-sources/files/9999_revert-conflicts.patch) | 0 | ||||
| -rw-r--r-- | sys-kernel/hardened-sources/files/9999_revert-conflicts-v2.patch | 23 | ||||
| -rw-r--r-- | sys-kernel/hardened-sources/files/linux-hardened-gentoo-v1.patch (renamed from sys-kernel/hardened-sources/files/linux-hardened-gentoo.patch) | 0 | ||||
| -rw-r--r-- | sys-kernel/hardened-sources/files/linux-hardened-gentoo-v2.patch | 10 |
4 files changed, 33 insertions, 0 deletions
diff --git a/sys-kernel/hardened-sources/files/9999_revert-conflicts.patch b/sys-kernel/hardened-sources/files/9999_revert-conflicts-v1.patch index b46aa1c..b46aa1c 100644 --- a/sys-kernel/hardened-sources/files/9999_revert-conflicts.patch +++ b/sys-kernel/hardened-sources/files/9999_revert-conflicts-v1.patch diff --git a/sys-kernel/hardened-sources/files/9999_revert-conflicts-v2.patch b/sys-kernel/hardened-sources/files/9999_revert-conflicts-v2.patch new file mode 100644 index 0000000..fabe571 --- /dev/null +++ b/sys-kernel/hardened-sources/files/9999_revert-conflicts-v2.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 EXPERT +- 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.patch b/sys-kernel/hardened-sources/files/linux-hardened-gentoo-v1.patch index 5bd9820..5bd9820 100644 --- a/sys-kernel/hardened-sources/files/linux-hardened-gentoo.patch +++ b/sys-kernel/hardened-sources/files/linux-hardened-gentoo-v1.patch diff --git a/sys-kernel/hardened-sources/files/linux-hardened-gentoo-v2.patch b/sys-kernel/hardened-sources/files/linux-hardened-gentoo-v2.patch new file mode 100644 index 0000000..6e32cd1 --- /dev/null +++ b/sys-kernel/hardened-sources/files/linux-hardened-gentoo-v2.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 EXPERT ++ 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, |