aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/module.c
diff options
context:
space:
mode:
authorThomas Richter <tmricht@linux.ibm.com>2018-04-18 03:14:36 -0400
committerJessica Yu <jeyu@kernel.org>2018-04-18 16:59:46 -0400
commitbe71eda5383faa663efdba9ef54a6b8255e3c7f0 (patch)
tree0abc0fe1fc5ecc7e9bacc2f8fac13eba3f8dd794 /kernel/module.c
parent60cc43fc888428bb2f18f08997432d426a243338 (diff)
module: Fix display of wrong module .text address
Reading file /proc/modules shows the correct address: [root@s35lp76 ~]# cat /proc/modules | egrep '^qeth_l2' qeth_l2 94208 1 - Live 0x000003ff80401000 and reading file /sys/module/qeth_l2/sections/.text [root@s35lp76 ~]# cat /sys/module/qeth_l2/sections/.text 0x0000000018ea8363 displays a random address. This breaks the perf tool which uses this address on s390 to calculate start of .text section in memory. Fix this by printing the correct (unhashed) address. Thanks to Jessica Yu for helping on this. Fixes: ef0010a30935 ("vsprintf: don't use 'restricted_pointer()' when not restricting") Cc: <stable@vger.kernel.org> # v4.15+ Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Thomas Richter <tmricht@linux.ibm.com> Cc: Jessica Yu <jeyu@kernel.org> Signed-off-by: Jessica Yu <jeyu@kernel.org>
Diffstat (limited to 'kernel/module.c')
-rw-r--r--kernel/module.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/module.c b/kernel/module.c
index a6e43a5806a1..ce8066b88178 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1472,7 +1472,8 @@ static ssize_t module_sect_show(struct module_attribute *mattr,
1472{ 1472{
1473 struct module_sect_attr *sattr = 1473 struct module_sect_attr *sattr =
1474 container_of(mattr, struct module_sect_attr, mattr); 1474 container_of(mattr, struct module_sect_attr, mattr);
1475 return sprintf(buf, "0x%pK\n", (void *)sattr->address); 1475 return sprintf(buf, "0x%px\n", kptr_restrict < 2 ?
1476 (void *)sattr->address : NULL);
1476} 1477}
1477 1478
1478static void free_sect_attrs(struct module_sect_attrs *sect_attrs) 1479static void free_sect_attrs(struct module_sect_attrs *sect_attrs)