Skip to contentSkip to conversation

module: Fix display of wrong module .text address

PATCH In review Thomas Richter 5 participants 8 messages Apr 18, 2018 – May 2, 2018 Stable branch

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 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 <[email protected]> # v4.15+
Cc Jessica Yu <[email protected]>
---
 kernel/module.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/module.c +2 -1
index a6e43a5806a1..40b42000bd80 100644
@@ -1472,7 +1472,8 @@ static ssize_t module_sect_show(struct module_attribute *mattr,
 {
 	struct module_sect_attr *sattr =
 		container_of(mattr, struct module_sect_attr, mattr);
-	return sprintf(buf, "0x%pK\n", (void *)sattr->address);
+	return sprintf(buf, "0x%px\n", kptr_restrict < 2 ?
+		       (void *)sattr->address : NULL);
 }
 
 static void free_sect_attrs(struct module_sect_attrs *sect_attrs)
Signature · 1 line
2.14.3
#1 lore raw
Quoted 14 lines · Thomas Richter

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.

Quoted 8 lines

Thanks to Jessica Yu for helping on this.

Fixes ef0010a30935 ("vsprintf: don't use 'restricted_pointer()' when not restricting")
Cc <[email protected]> # v4.15+
Cc Jessica Yu <[email protected]>

---

What's changed in each version please?

thanks,
Tobin.

#2 lore raw
Quoted 24 lines · Tobin C. Harding
Quoted 14 lines · Thomas Richter

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.

Quoted 8 lines

Thanks to Jessica Yu for helping on this.

Fixes ef0010a30935 ("vsprintf: don't use 'restricted_pointer()' when not restricting")
Cc <[email protected]> # v4.15+
Cc Jessica Yu <[email protected]>

---

Quoted 6 lines

What's changed in each version please?

thanks,
Tobin.

V2: Changed sprintf format string from %#lx to 0x%px (suggested by Kees Cook).
V3: Changed sprintf agrument from 0 to NULL to avoid sparse warning.

Signature · 5 lines
Thomas Richter, Dept 3303, IBM LTC Boeblingen Germany
--
Vorsitzende des Aufsichtsrats: Martina Koederitz 
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Acked-by on v3 1/1
#3 lore raw
In reply to Thomas Richter

+++ Thomas Richter [18/04/18 09:14 +0200]:

Quoted 14 lines

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.

Quoted 7 lines

Thanks to Jessica Yu for helping on this.

Fixes ef0010a30935 ("vsprintf: don't use 'restricted_pointer()' when not restricting")
Cc <[email protected]> # v4.15+
Cc Jessica Yu <[email protected]>

Thanks for turning this into a real patch. Looks good to me, if Linus wants to take it directly:

Otherwise I can take this up my tree.

As Linus mentioned, we should technically be checking the opening task's credentials/capabilities, but converting everything to pass the actual struct seq_file/file to the sysfs show handlers would be fairly painful :/ At least those /sys/module/*/sections/ files are all set to 0400. I think this fix is sufficient for now.

Quoted 21 lines

---
kernel/module.c | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)
kernel/module.c +2 -1
index a6e43a5806a1..40b42000bd80 100644
@@ -1472,7 +1472,8 @@ static ssize_t module_sect_show(struct module_attribute *mattr,
 {
 	struct module_sect_attr *sattr =
 		container_of(mattr, struct module_sect_attr, mattr);
-	return sprintf(buf, "0x%pK\n", (void *)sattr->address);
+	return sprintf(buf, "0x%px\n", kptr_restrict < 2 ?
+		       (void *)sattr->address : NULL);
 }
 
 static void free_sect_attrs(struct module_sect_attrs *sect_attrs)
Signature · 1 line
2.14.3
#4 lore raw
Quoted 2 lines · Jessica Yu

Otherwise I can take this up my tree.

Take it through your tree.

It's not some recent thing that stops people from testing other stuff (which is when I tend to try to take it directly just to short-circuit any delays), so it might as well go through the "proper channels".

Thanks,

Linus

#5 lore raw
In reply to Thomas Richter
Quoted 30 lines · Thomas Richter

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 <[email protected]> # v4.15+
Cc Jessica Yu <[email protected]>
---
 kernel/module.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/module.c +0 -0
index a6e43a5806a1..40b42000bd80 100644

kernel/module.c static ssize_t module_sect_show(struct module_attribute *mattr, · line 1476

Quoted 6 lines
kernel/module.c +2 -1
@@ -1472,7 +1472,8 @@ static ssize_t module_sect_show(struct module_attribute *mattr,
 {
        struct module_sect_attr *sattr =
                container_of(mattr, struct module_sect_attr, mattr);
-       return sprintf(buf, "0x%pK\n", (void *)sattr->address);
+       return sprintf(buf, "0x%px\n", kptr_restrict < 2 ?
+                      (void *)sattr->address : NULL);

Errr... this looks reversed to me.

I would expect: "kptr_restrict < 2 ? NULL : (void *)sattr->address"

-Kees

Signature · 2 lines
Kees Cook
Pixel Security
#6 lore raw
Quoted 40 lines · Kees Cook
Quoted 30 lines · Thomas Richter

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 <[email protected]> # v4.15+
Cc Jessica Yu <[email protected]>
---
 kernel/module.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/module.c +0 -0
index a6e43a5806a1..40b42000bd80 100644

kernel/module.c static ssize_t module_sect_show(struct module_attribute *mattr, · line 1476

Quoted 6 lines
kernel/module.c +2 -1
@@ -1472,7 +1472,8 @@ static ssize_t module_sect_show(struct module_attribute *mattr,
 {
        struct module_sect_attr *sattr =
                container_of(mattr, struct module_sect_attr, mattr);
-       return sprintf(buf, "0x%pK\n", (void *)sattr->address);
+       return sprintf(buf, "0x%px\n", kptr_restrict < 2 ?
+                      (void *)sattr->address : NULL);

Errr... this looks reversed to me.

Quoted 4 lines

I would expect: "kptr_restrict < 2 ? NULL : (void *)sattr->address"

-Kees

I am confused:
In my patch, if kptr_restrict == 2 it prints NULL, which kptr_restrict being 0 or 1 it prints the address.

In your comment if kptr_restrict == 2 it prints the address, which kptr_restrict being 0 or 1 it prints NULL.

Looking into Documentation/sysctl/kernel.txt:
When kptr_restrict is set to (2), kernel pointers printed using %pK will be replaced with 0's regardless of privileges.

With my patch, setting kptr_restrict to 0 or 1 prints the real kernel address (format %px, unmodified address according to Documentation/printk-formats.txt).

I have tested this on s390 (which is the only arch using file /sys/module/<XXX>/sections/.text) in the perf tool.

root@s8360047 ~]# sysctl kernel.kptr_restrict
kernel.kptr_restrict = 0
[root@s8360047 ~]# cat /proc/modules | egrep '^qeth_l2'
qeth_l2 102400 1 - Live 0x000003ff8034d000
[root@s8360047 ~]# cat /sys/module/qeth_l2/sections/.text
0x000003ff8034da68
[root@s8360047 ~]# sysctl -w kernel.kptr_restrict=2
kernel.kptr_restrict = 2
[root@s8360047 ~]# cat /proc/modules | egrep '^qeth_l2'
qeth_l2 102400 1 - Live 0x0000000000000000
[root@s8360047 ~]# cat /sys/module/qeth_l2/sections/.text
0x0000000000000000
[root@s8360047 ~]# uname -a
Linux s8360047 4.17.0-rc3m-perf+ #6 SMP PREEMPT Wed May 2 10:02:38 CEST 2018 s390x s390x s390x GNU/Linux [root@s8360047 ~]#

Hope this helps.

Signature · 5 lines
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany
--
Vorsitzende des Aufsichtsrats: Martina Koederitz 
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
#7 lore raw
Quoted 80 lines · Thomas-Mich Richter
Quoted 40 lines · Kees Cook
Quoted 30 lines · Thomas Richter

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 <[email protected]> # v4.15+
Cc Jessica Yu <[email protected]>
---
 kernel/module.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/module.c +0 -0
index a6e43a5806a1..40b42000bd80 100644

kernel/module.c static ssize_t module_sect_show(struct module_attribute *mattr, · line 1476

Quoted 6 lines
kernel/module.c +2 -1
@@ -1472,7 +1472,8 @@ static ssize_t module_sect_show(struct module_attribute *mattr,
 {
        struct module_sect_attr *sattr =
                container_of(mattr, struct module_sect_attr, mattr);
-       return sprintf(buf, "0x%pK\n", (void *)sattr->address);
+       return sprintf(buf, "0x%px\n", kptr_restrict < 2 ?
+                      (void *)sattr->address : NULL);

Errr... this looks reversed to me.

Quoted 4 lines

I would expect: "kptr_restrict < 2 ? NULL : (void *)sattr->address"

-Kees

I am confused:
In my patch, if kptr_restrict == 2 it prints NULL, which kptr_restrict being 0 or 1 it prints the address.

In your comment if kptr_restrict == 2 it prints the address, which kptr_restrict being 0 or 1 it prints NULL.

Looking into Documentation/sysctl/kernel.txt:
When kptr_restrict is set to (2), kernel pointers printed using %pK will be replaced with 0's regardless of privileges.

With my patch, setting kptr_restrict to 0 or 1 prints the real kernel address (format %px, unmodified address according to Documentation/printk-formats.txt).

I have tested this on s390 (which is the only arch using file /sys/module/<XXX>/sections/.text) in the perf tool.

root@s8360047 ~]# sysctl kernel.kptr_restrict
kernel.kptr_restrict = 0
[root@s8360047 ~]# cat /proc/modules | egrep '^qeth_l2'
qeth_l2 102400 1 - Live 0x000003ff8034d000
[root@s8360047 ~]# cat /sys/module/qeth_l2/sections/.text
0x000003ff8034da68
[root@s8360047 ~]# sysctl -w kernel.kptr_restrict=2
kernel.kptr_restrict = 2
[root@s8360047 ~]# cat /proc/modules | egrep '^qeth_l2'
qeth_l2 102400 1 - Live 0x0000000000000000
[root@s8360047 ~]# cat /sys/module/qeth_l2/sections/.text
0x0000000000000000
[root@s8360047 ~]# uname -a
Linux s8360047 4.17.0-rc3m-perf+ #6 SMP PREEMPT Wed May 2 10:02:38 CEST 2018 s390x s390x s390x GNU/Linux [root@s8360047 ~]#

Quoted 1 line

Hope this helps.

Thanks! Yes, I was looking at too many of the %px commits in a row and confused myself. Sorry for the noise!

-Kees

Signature · 2 lines
Kees Cook
Pixel Security