From 2fe065dee79d9eb3525116a262083bc71a9b5c73 Mon Sep 17 00:00:00 2001
From: Dave Weinstein <olorin@google.com>
Date: Wed, 11 Jan 2017 15:39:07 -0800
Subject: 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>
---
 kernel/sysctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kernel/sysctl.c')

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
 	{
-- 
cgit v1.2.3