X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=lib%2Fvsprintf.c;h=d74c317f4b29d29783c5bb74eeb2e0a46328da8b;hp=993599e66e5a91bf4a5ff22565b4a7560651128c;hb=1b772a147a183c09462f0d23e041b077f158fa0f;hpb=16ee792e45cf0c97ce061fce03c36cab5551ec72

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 993599e66e5a..d74c317f4b29 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -886,7 +886,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
 		 * %pK cannot be used in IRQ context because its test
 		 * for CAP_SYSLOG would be meaningless.
 		 */
-		if (in_irq() || in_serving_softirq() || in_nmi()) {
+		if (kptr_restrict && (in_irq() || in_serving_softirq() ||
+				      in_nmi())) {
 			if (spec.field_width == -1)
 				spec.field_width = 2 * sizeof(void *);
 			return string(buf, end, "pK-error", spec);