aboutsummaryrefslogtreecommitdiff
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorDave Weinstein <olorin@google.com>2017-01-11 15:39:07 -0800
committerMoyster <oysterized@gmail.com>2019-05-05 12:34:01 +0200
commitd338ea894e75c1e23eba352da5240d9cf878d579 (patch)
tree891f4f539f839062fbf1fa84dbba3e7b6326ed45 /kernel/sysctl.c
parenta306466e6cbe509c33d2bf8ce9cfd26098740975 (diff)
downloadandroid_kernel_m2note-d338ea894e75c1e23eba352da5240d9cf878d579.tar.gz
ANDROID: lib: vsprintf: additional kernel pointer filtering options
Add the kptr_restrict setting of 3 which results in both %p and %pK values being replaced by zeros. Add an additional %pP value inspired by the Grsecurity option which explicitly whitelists pointers for output. This patch is based on work by William Roberts <william.c.roberts@intel.com> [CV: fixed GCC warning on 32 bit targets] BUG: 30368199 Change-Id: Ic5cef86617f7758514271edd67199683d2c4e2bb Signed-off-by: Dave Weinstein <olorin@google.com>
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 63ad2ac67..2555c81d9 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -788,7 +788,7 @@ static struct ctl_table kern_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec_minmax_sysadmin,
.extra1 = &zero,
- .extra2 = &two,
+ .extra2 = &three,
},
#endif
{