kptr_restrict for hiding kernel pointers
Subsystems (6)
PATCH v3 1/1 kptr_restrict for hiding kernel pointers
Add the %pK printk format specifier and
the /proc/sys/kernel/kptr_restrict sysctl.
The %pK format specifier is designed to hide exposed kernel pointers, specifically via /proc interfaces. Exposing these pointers provides an easy target for kernel write vulnerabilities, since they reveal the locations of writable structures containing easily triggerable function pointers. The behavior of %pK depends on the kptr_restrict sysctl.
If kptr_restrict is set to 0, no deviation from the standard %p behavior occurs. If kptr_restrict is set to 1, if the current user (intended to be a reader via seq_printf(), etc.) does not have CAP_SYSLOG (which is currently in the LSM tree), kernel pointers using %pK are printed as 0's. If kptr_restrict is set to 2, kernel pointers using %pK are printed as 0's regardless of privileges. Replacing with 0's was chosen over the default "(null)", which cannot be parsed by userland %p, which expects "(nil)".
v3 adds the "2" setting, cleans up documentation, removes the CONFIG, and incorporates changes and suggestions from Andrew Morton.
v2 improves checking for inappropriate context, on suggestion by Peter Zijlstra. Thanks to Thomas Graf for suggesting use of a centralized format specifier.
---
Documentation/sysctl/kernel.txt | 14 ++++++++++++++ include/linux/kernel.h | 2 ++ kernel/sysctl.c | 9 +++++++++ lib/vsprintf.c | 23 +++++++++++++++++++++++ 4 files changed, 48 insertions(+), 0 deletions(-)
Documentation/sysctl/kernel.txt +14 -0
@@ -34,6 +34,7 @@ show up in /proc/sys/kernel: - hotplug - java-appletviewer [ binfmt_java, obsolete ] - java-interpreter [ binfmt_java, obsolete ] +- kptr_restrict - kstack_depth_to_print [ X86 only ] - l2cr [ PPC only ] - modprobe ==> Documentation/debugging-modules.txt
@@ -261,6 +262,19 @@ This flag controls the L2 cache of G3 processor boards. If ============================================================== +kptr_restrict: + +This toggle indicates whether restrictions are placed on +exposing kernel addresses via /proc and other interfaces. When +kptr_restrict is set to (0), the default, there are no +restrictions. When kptr_restrict is set to (1), kernel pointers +printed using the %pK format specifier will be replaced with 0's +unless the user has CAP_SYSLOG. When kptr_restrict is set to +(2), kernel pointers printed using %pK will be replaced with 0's +regardless of privileges. + +============================================================== + kstack_depth_to_print: (X86 only) Controls the number of words to print when dumping the raw
include/linux/kernel.h +2 -0
@@ -201,6 +201,8 @@ extern int sscanf(const char *, const char *, ...)extern int vsscanf (const char *,const char *,va_list ) __attribute__ ((format (scanf,2 ,0 ))); +extern int kptr_restrict;/* for sysctl */ +extern int get_option (char **str,int *pint);extern char *get_options (const char *str,int nints,int *ints);extern unsigned long long memparse (const char *ptr,char **retptr);
kernel/sysctl.c +9 -0
@@ -713,6 +713,15 @@ static struct ctl_table kern_table[] = { },#endif { + .procname = "kptr_restrict", + .data = &kptr_restrict, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = &zero, + .extra2 = &two, + }, + { .procname = "ngroups_max", .data = &ngroups_max, .maxlen = sizeof (int),
lib/vsprintf.c +23 -0
@@ -936,6 +936,8 @@ char *uuid_string(char *buf, char *end, const u8 *addr,return string (buf, end, uuid, spec); } +int kptr_restrict; +/* * Show a '%p' thing. A kernel extension is that the '%p' is followed * by an extra set of alphanumeric characters that are extended format
@@ -979,6 +981,7 @@ char *uuid_string(char *buf, char *end, const u8 *addr,* Implements a "recursive vsnprintf". * Do not use this feature without some mechanism to verify the * correctness of the format string and va_list arguments. +* - 'K' For a kernel pointer that should be hidden from unprivileged users * * Note: The difference between 'S' and 'F' is that on ia64 and ppc64 * function pointers are really function descriptors, which contain a
@@ -1035,6 +1038,26 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,return buf +vsnprintf (buf, end - buf, ((struct va_format *)ptr)->fmt, *(((struct va_format *)ptr)->va)); +case 'K' : +/* +* %pK cannot be used in IRQ context because it tests +* CAP_SYSLOG. +*/ +if (in_irq () ||in_serving_softirq () ||in_nmi ()) +WARN_ONCE (1 ,"%%pK used in interrupt context.\n" ); + +if (!kptr_restrict) +break ;/* %pK does not obscure pointers */ + +if ((kptr_restrict !=2 ) &&capable (CAP_SYSLOG )) +break ;/* privileged apps expose pointers, +unless kptr_restrict is 2 */ + +if (spec.field_width ==-1 ) { + spec.field_width =2 *sizeof (void *); + spec.flags |=ZEROPAD ; + } +return number (buf, end,0 , spec); } spec.flags |=SMALL ;if (spec.field_width ==-1 ) {
Quoted 2 lines · Dan Rosenberg
v3 adds the "2" setting, cleans up documentation, removes the CONFIG, and incorporates changes and suggestions from Andrew Morton.
Signature · 2 lines
Kees Cook Ubuntu Security Team
Quoted 8 lines · Dan Rosenberg
lib/vsprintf.c +4
-0@@ -1035,6 +1038,26 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, return buf + vsnprintf(buf, end - buf, ((struct va_format *)ptr)->fmt, *(((struct va_format *)ptr)->va)); + case 'K': + /* +* %pK cannot be used in IRQ context because it tests +* CAP_SYSLOG.
lib/vsprintf.c char *pointer(const char *fmt, char *buf, char *end, void *ptr, · line 1054
Quoted 10 lines
lib/vsprintf.c +10
-0+*/ + if (in_irq() || in_serving_softirq() || in_nmi()) + WARN_ONCE(1, "%%pK used in interrupt context.\n"); + + if (!kptr_restrict) + break; /* %pK does not obscure pointers */ + + if ((kptr_restrict != 2) && capable(CAP_SYSLOG)) + break; /* privileged apps expose pointers, +unless kptr_restrict is 2 */
I would suggest has_capability_noaudit() since a failure here is not a security policy violation it is just a code path choice.
I was confused also by the comment about CAP_SYSLOG and IRQ context. You can check CAP_SYSLOG in IRQ context, it's just that the result is not going to have any relation to the work being done. This function in general doesn't make sense in that context and I don't think saying that has anything to do with CAP_SYSLOG makes that clear.... Unless I'm misunderstanding...
Quoted 25 lines · Eric Paris
Quoted 8 lines · Dan Rosenberg
lib/vsprintf.c +4
-0@@ -1035,6 +1038,26 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, return buf + vsnprintf(buf, end - buf, ((struct va_format *)ptr)->fmt, *(((struct va_format *)ptr)->va)); + case 'K': + /* +* %pK cannot be used in IRQ context because it tests +* CAP_SYSLOG. lib/vsprintf.c char *pointer(const char *fmt, char *buf, char *end, void *ptr, · line 1054
Quoted 10 lines
lib/vsprintf.c +10
-0+*/ + if (in_irq() || in_serving_softirq() || in_nmi()) + WARN_ONCE(1, "%%pK used in interrupt context.\n"); + + if (!kptr_restrict) + break; /* %pK does not obscure pointers */ + + if ((kptr_restrict != 2) && capable(CAP_SYSLOG)) + break; /* privileged apps expose pointers, +unless kptr_restrict is 2 */ I would suggest
has_capability_noaudit()since a failure here is not a security policy violation it is just a code path choice.
Quoted 6 lines
I was confused also by the comment about
CAP_SYSLOGand IRQ context. You can checkCAP_SYSLOGin IRQ context, it's just that the result is not going to have any relation to the work being done. This function in general doesn't make sense in that context and I don't think saying that has anything to do withCAP_SYSLOGmakes that clear.... Unless I'm misunderstanding...
Just went back and reread akpm's comments on -v2. I guess we see it the same way, I just thought this comment on first glance indicated that capable() wasn't IRQ safe (it is) not that it just was
meaningless... I don't think rewriting the comment is necessary.
Sorry for that half of the message....
lib/vsprintf.c char *pointer(const char *fmt, char *buf, char *end, void *ptr, · line 1047
Quoted 11 lines · Dan Rosenberg
lib/vsprintf.c +7
-0@@ -1035,6 +1038,26 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,return buf +vsnprintf (buf, end - buf, ((struct va_format *)ptr)->fmt, *(((struct va_format *)ptr)->va)); +case 'K' : +/* +* %pK cannot be used in IRQ context because it tests +* CAP_SYSLOG. +*/ +if (in_irq () ||in_serving_softirq () ||in_nmi ()) +WARN_ONCE (1 ,"%%pK used in interrupt context.\n" );
Should this then continue on and test CAP_SYSLOG anyhow, or should it return a "" or or "<invalid>" or something?
Quoted 16 lines · On Mon, 2010-12-20 at 17:26 -0500, [email protected] wrote:
lib/vsprintf.c char *pointer(const char *fmt, char *buf, char *end, void *ptr, · line 1047
Quoted 11 lines · Dan Rosenberg
lib/vsprintf.c +7
-0@@ -1035,6 +1038,26 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,return buf +vsnprintf (buf, end - buf, ((struct va_format *)ptr)->fmt, *(((struct va_format *)ptr)->va)); +case 'K' : +/* +* %pK cannot be used in IRQ context because it tests +* CAP_SYSLOG. +*/ +if (in_irq () ||in_serving_softirq () ||in_nmi ()) +WARN_ONCE (1 ,"%%pK used in interrupt context.\n" );Should this then continue on and test
CAP_SYSLOGanyhow, or should it return a "" or or "<invalid>" or something?
This is a valid point. I'll resend a new version shortly that defaults to zeroing pointers if it's used incorrectly without relying on capability checks.
Thanks,
Dan