aboutsummaryrefslogtreecommitdiff
path: root/drivers/char/random.c
diff options
context:
space:
mode:
authorGravatar Helge Deller <deller@gmx.de> 2017-08-08 18:28:41 +0200
committerGravatar Linus Torvalds <torvalds@linux-foundation.org> 2017-08-08 09:36:46 -0700
commit51d96dc2e2dc2cf9b81cf976cc93c51ba3ac2f92 (patch)
treeced87ea4ce1ab9ad9f8754c6a9b7c5e06c48dedf /drivers/char/random.c
parentMerge tag 'xtensa-20170807' of git://github.com/jcmvbkbc/linux-xtensa (diff)
downloadlinux-51d96dc2e2dc2cf9b81cf976cc93c51ba3ac2f92.tar.gz
linux-51d96dc2e2dc2cf9b81cf976cc93c51ba3ac2f92.tar.bz2
linux-51d96dc2e2dc2cf9b81cf976cc93c51ba3ac2f92.zip
random: fix warning message on ia64 and parisc
Fix the warning message on the parisc and IA64 architectures to show the correct function name of the caller by using %pS instead of %pF. The message is printed with the value of _RET_IP_ which calls __builtin_return_address(0) and as such returns the IP address caller instead of pointer to a function descriptor of the caller. The effect of this patch is visible on the parisc and ia64 architectures only since those are the ones which use function descriptors while on all others %pS and %pF will behave the same. Cc: Theodore Ts'o <tytso@mit.edu> Cc: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Helge Deller <deller@gmx.de> Fixes: eecabf567422 ("random: suppress spammy warnings about unseeded randomness") Fixes: d06bfd1989fe ("random: warn when kernel uses unseeded randomness") Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/random.c')
-rw-r--r--drivers/char/random.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c
index afa3ce7d3e72..8ad92707e45f 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1492,7 +1492,7 @@ static void _warn_unseeded_randomness(const char *func_name, void *caller,
#ifndef CONFIG_WARN_ALL_UNSEEDED_RANDOM
print_once = true;
#endif
- pr_notice("random: %s called from %pF with crng_init=%d\n",
+ pr_notice("random: %s called from %pS with crng_init=%d\n",
func_name, caller, crng_init);
}