diff options
-rw-r--r-- | lib/vsprintf.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index d3023df8477f..070d134eef71 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c | |||
@@ -1047,16 +1047,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, | |||
1047 | if (spec.field_width == -1) | 1047 | if (spec.field_width == -1) |
1048 | spec.field_width = 2 * sizeof(void *); | 1048 | spec.field_width = 2 * sizeof(void *); |
1049 | return string(buf, end, "pK-error", spec); | 1049 | return string(buf, end, "pK-error", spec); |
1050 | } else if ((kptr_restrict == 0) || | ||
1051 | (kptr_restrict == 1 && | ||
1052 | has_capability_noaudit(current, CAP_SYSLOG))) | ||
1053 | break; | ||
1054 | |||
1055 | if (spec.field_width == -1) { | ||
1056 | spec.field_width = 2 * sizeof(void *); | ||
1057 | spec.flags |= ZEROPAD; | ||
1058 | } | 1050 | } |
1059 | return number(buf, end, 0, spec); | 1051 | if (!((kptr_restrict == 0) || |
1052 | (kptr_restrict == 1 && | ||
1053 | has_capability_noaudit(current, CAP_SYSLOG)))) | ||
1054 | ptr = NULL; | ||
1055 | break; | ||
1060 | } | 1056 | } |
1061 | spec.flags |= SMALL; | 1057 | spec.flags |= SMALL; |
1062 | if (spec.field_width == -1) { | 1058 | if (spec.field_width == -1) { |