[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20170506040747.GF32707@kroah.com>
Date: Fri, 5 May 2017 21:07:47 -0700
From: Greg KH <gregkh@...uxfoundation.org>
To: kernel-hardening@...ts.openwall.com, Petr Mladek <pmladek@...e.com>,
Sergey Senozhatsky <sergey.senozhatsky@...il.com>
Cc: linux-kernel@...r.kernel.org, Catalin Marinas <catalin.marinas@....com>,
Will Deacon <will.deacon@....com>,
Steven Rostedt <rostedt@...dmis.org>,
William Roberts <william.c.roberts@...el.com>,
Chris Fries <cfries@...gle.com>, Dave Weinstein <olorin@...gle.com>
Subject: [RFC 5/6] lib: vsprintf: Add "%paP", "%padP" options
From: Chris Fries <cfries@...gle.com>
Add %paP and %padP for physical address that need to always be shown
regardless of kptr restrictions.
Cc: William Roberts <william.c.roberts@...el.com>
Cc: Dave Weinstein <olorin@...gle.com>
Signed-off-by: Chris Fries <cfries@...gle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
Documentation/printk-formats.txt | 10 ++++++----
lib/vsprintf.c | 12 +++++++++---
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/Documentation/printk-formats.txt b/Documentation/printk-formats.txt
index 8994c65aa3b0..7ee51269096f 100644
--- a/Documentation/printk-formats.txt
+++ b/Documentation/printk-formats.txt
@@ -82,18 +82,20 @@ Struct Resources:
Physical addresses types phys_addr_t:
- %pa[p] 0x01234567 or 0x0123456789abcdef
+ %pa[p][P] 0x01234567 or 0x0123456789abcdef
For printing a phys_addr_t type (and its derivatives, such as
resource_size_t) which can vary based on build options, regardless of
- the width of the CPU data path. Passed by reference.
+ the width of the CPU data path. Passed by reference. Use the trailing
+ 'P' if it needs to be always shown.
DMA addresses types dma_addr_t:
- %pad 0x01234567 or 0x0123456789abcdef
+ %pad[P] 0x01234567 or 0x0123456789abcdef
For printing a dma_addr_t type which can vary based on build options,
- regardless of the width of the CPU data path. Passed by reference.
+ regardless of the width of the CPU data path. Passed by reference. Use
+ the trailing 'P' if it needs to be always shown.
Raw buffer as an escaped string:
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 404d477d4bd2..37f9d615e622 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1394,23 +1394,29 @@ static noinline_for_stack
char *address_val(char *buf, char *end, const void *addr, const char *fmt)
{
unsigned long long num;
+ int cleanse = kptr_restrict_cleanse_addresses();
+ int decleanse_idx = 1;
int size;
switch (fmt[1]) {
case 'd':
num = *(const dma_addr_t *)addr;
size = sizeof(dma_addr_t);
+ decleanse_idx = 2;
break;
case 'p':
+ decleanse_idx = 2;
+ /* fall thru */
default:
num = *(const phys_addr_t *)addr;
size = sizeof(phys_addr_t);
break;
}
- return special_hex_number(buf, end,
- kptr_restrict_cleanse_addresses() ? 0UL : num,
- size);
+ /* 'P' on the tail means don't restrict the pointer. */
+ cleanse = cleanse && (fmt[decleanse_idx] != 'P');
+
+ return special_hex_number(buf, end, cleanse ? 0UL : num, size);
}
static noinline_for_stack
--
2.12.2
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
