From ab5b0021d0e00e554aedccab462069dcd63693ac Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Mon, 10 Jun 2019 09:46:34 -0700 Subject: Updated to 5.1.8.a --- ck_modify-for-hardened.patch | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'ck_modify-for-hardened.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 -- cgit v1.2.1