lib/vsprintf: Hash legacy clock addresses

On platforms using the Common Clock Framework, "%pC" prints the clock's
name. On legacy platforms, it prints the unhashed clock's address,
potentially leaking sensitive information regarding the kernel layout in
memory.

Avoid this leak by printing the hashed address instead.  To distinguish
between clocks, a 32-bit unique identifier is as good as an actual
pointer value.

Fixes: ad67b74d24 ("printk: hash addresses printed with %p")
Link: http://lkml.kernel.org/r/20181011084249.4520-3-geert+renesas@glider.be
To: "Tobin C . Harding" <me@tobin.cc>
To: Andrew Morton <akpm@linux-foundation.org>
To: Jonathan Corbet <corbet@lwn.net>
Cc: linux-doc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
This commit is contained in:
Geert Uytterhoeven 2018-10-11 10:42:48 +02:00 committed by Petr Mladek
parent 9073dac14e
commit ec12bc2909
2 changed files with 3 additions and 4 deletions

View File

@ -420,9 +420,8 @@ struct clk
%pC pll1 %pC pll1
%pCn pll1 %pCn pll1
For printing struct clk structures. %pC and %pCn print the name For printing struct clk structures. %pC and %pCn print the name of the clock
(Common Clock Framework) or address (legacy clock framework) of the (Common Clock Framework) or a unique 32-bit ID (legacy clock framework).
structure.
Passed by reference. Passed by reference.

View File

@ -1563,7 +1563,7 @@ char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec,
#ifdef CONFIG_COMMON_CLK #ifdef CONFIG_COMMON_CLK
return string(buf, end, __clk_get_name(clk), spec); return string(buf, end, __clk_get_name(clk), spec);
#else #else
return special_hex_number(buf, end, (unsigned long)clk, sizeof(unsigned long)); return ptr_to_id(buf, end, clk, spec);
#endif #endif
} }
} }