]> git.baikalelectronics.ru Git - kernel.git/commit
vsprintf: kptr_restrict is okay in IRQ when 2
authorJason A. Donenfeld <Jason@zx2c4.com>
Fri, 12 Feb 2016 00:13:00 +0000 (16:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Feb 2016 02:35:48 +0000 (18:35 -0800)
commit6957d05ff2de1466d74a305a6a206619e1614739
treee531c88307514653e1fa5de03ec37fdf81bf3a6c
parent4e774a2ca159c379ed34b2fe39ba6ecb2de66540
vsprintf: kptr_restrict is okay in IRQ when 2

The kptr_restrict flag, when set to 1, only prints the kernel address
when the user has CAP_SYSLOG.  When it is set to 2, the kernel address
is always printed as zero.  When set to 1, this needs to check whether
or not we're in IRQ.

However, when set to 2, this check is unneccessary, and produces
confusing results in dmesg.  Thus, only make sure we're not in IRQ when
mode 1 is used, but not mode 2.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
lib/vsprintf.c