diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2019-06-09 12:05:55 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2019-06-09 12:05:55 -0700 |
| commit | 14547284623a55a9a35b3734eb6106cd3c9573ce (patch) | |
| tree | c6089023cd5ddf208511195501ca6a6915870326 | |
| parent | Updated to 5.1.8.a (diff) | |
| download | linux-hardened-ck-14547284623a55a9a35b3734eb6106cd3c9573ce.tar.xz | |
| -rw-r--r-- | PKGBUILD | 3 | ||||
| -rw-r--r-- | ck_modify-for-hardened.patch | 22 |
2 files changed, 13 insertions, 12 deletions
@@ -58,7 +58,7 @@ sha256sums=('d0164ffcc6e2ab3a96cc771d3fbdf2f8b49a2597ec4da9a06df590b0fe87a6ec' 'de89d0872949882a90b536fbe08f7a196ef046bffa6b0cf459f839e7f28af88f' 'SKIP' 'a2db6672b2d35f3006c7151e8fa90f5187dcdac9fcc46e88e78d45c7d8226d1f' - 'b6defd1ef672b73631ecfa79fc204d6219175f333b53d86af668c1e1a9b6288e' + '19ae3f60f43a88ee689573ba48be518faa550f49b263a1a52c31c3c9bae1f5c5' 'f8d18a34f6b17ec8e5f2a7354383ca627e0fd00b5578c1ee7d9808a34f33c724' '229e063a578db0a278108f37b24da20c2a2a18d825e98a67e426cb0f4b492e4a' '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d' @@ -98,7 +98,6 @@ prepare() { msg2 "Applying ck patch hotfixes" patch -p1 -i ../ck_remove-excess-extraversion.patch "$srcdir/${_ckpatch}" patch -p1 -i ../ck_modify-for-hardened.patch "$srcdir/${_ckpatch}" - sed -i '/-CFLAGS/ s/$/ \$(LIBELF_FLAGS)/' "$srcdir/${_ckpatch}" # ck patch msg2 "Applying ck patch" diff --git a/ck_modify-for-hardened.patch b/ck_modify-for-hardened.patch index c54860a..06e13c2 100644 --- a/ck_modify-for-hardened.patch +++ b/ck_modify-for-hardened.patch @@ -1,17 +1,19 @@ ---- a/patch-5.0-ck1 -+++ b/patch-5.0-ck1 -@@ -16348,15 +16348,11 @@ - index ba4d9e85feb8..226771720139 100644 +--- a/patch-5.1-ck1 ++++ b/patch-5.1-ck1 +@@ -16348,15 +16348,13 @@ diff --git a/kernel/sysctl.c b/kernel/sysctl.c + index c9ec050bcf46..8f91e2a76e29 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c --@@ -127,9 +127,17 @@ static int __maybe_unused one = 1; -- static int __maybe_unused two = 2; -- static int __maybe_unused four = 4; +-@@ -131,9 +131,17 @@ static int __maybe_unused four = 4; +- static unsigned long zero_ul; - static unsigned long one_ul = 1; +- static unsigned long long_max = LONG_MAX; --static int one_hundred = 100; --static int one_thousand = 1000; -+@@ -127,7 +127,15 @@ static int __maybe_unused four __read_only = 4; ++@@ -131,9 +131,17 @@ static int __maybe_unused four __read_only = 4; ++ static unsigned long zero_ul __read_only; + static unsigned long one_ul __read_only = 1; ++ static unsigned long long_max __read_only = LONG_MAX; + static int one_hundred __read_only = 100; + static int one_thousand __read_only = 1000; -#ifdef CONFIG_PRINTK @@ -29,7 +31,7 @@ #endif #ifdef CONFIG_PERF_EVENTS @@ -296,7 +304,7 @@ static struct ctl_table sysctl_base_table[] = { -@@ -16375,9 +16371,9 @@ +@@ -16375,9 +16371,9 @@ }; -#ifdef CONFIG_SCHED_DEBUG +#if defined(CONFIG_SCHED_DEBUG) && !defined(CONFIG_SCHED_MUQSS) @@ -39,6 +41,6 @@ + static int min_sched_granularity_ns __read_only = 100000; /* 100 usecs */ + static int max_sched_granularity_ns __read_only = NSEC_PER_SEC; /* 1 second */ + static int min_wakeup_granularity_ns __read_only; /* 0 usecs */ - @@ -313,6 +321,7 @@ static int max_extfrag_threshold = 1000; + @@ -322,6 +330,7 @@ static int max_extfrag_threshold = 1000; #endif |