Skip to contentSkip to conversation

modules: Fix display of wrong module .text address

PATCH Superseded Thomas Richter 4 participants 5 messages Apr 17, 2018

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 modules: Fix display of wrong module .text address

In kernel v4.16.0 the module .text address is displayed wrong when using /sys/module/*/sections/.text file.
Commit ef0010a30935 ("vsprintf: don't use 'restricted_pointer()' when not restricting")
is the first bad commit.

Here is the issue, using module qeth_l2 on s390 which is the ethernet device driver:

[root@s35lp76 ~]# lsmod
Module Size Used by
qeth_l2 94208 1
...

[root@s35lp76 ~]# cat /proc/modules | egrep '^qeth_l2' qeth_l2 94208 1 - Live 0x000003ff80401000
^ This is the correct address in memory
[root@s35lp76 ~]# cat /sys/module/qeth_l2/sections/.text
0x0000000018ea8363 <---- This is a wrong address
[root@s35lp76 ~]#

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.

---
 kernel/module.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/module.c +1 -1
index a6e43a5806a1..77ab7211ddef 100644
@@ -1472,7 +1472,7 @@ 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, "%#lx\n", kptr_restrict < 2 ? sattr->address : 0);
 }
 
 static void free_sect_attrs(struct module_sect_attrs *sect_attrs)
Signature · 1 line
2.14.3
#1 lore raw
Quoted 24 lines · Thomas Richter

In kernel v4.16.0 the module .text address is displayed wrong when using /sys/module/*/sections/.text file.
Commit ef0010a30935 ("vsprintf: don't use 'restricted_pointer()' when not restricting")
is the first bad commit.

Here is the issue, using module qeth_l2 on s390 which is the ethernet device driver:

[root@s35lp76 ~]# lsmod
Module Size Used by
qeth_l2 94208 1
...

[root@s35lp76 ~]# cat /proc/modules | egrep '^qeth_l2' qeth_l2 94208 1 - Live 0x000003ff80401000
^ This is the correct address in memory
[root@s35lp76 ~]# cat /sys/module/qeth_l2/sections/.text
0x0000000018ea8363 <---- This is a wrong address
[root@s35lp76 ~]#

This breaks the perf tool which uses this address on s390 to calculate start of .text section in memory.

Quoted 7 lines

Fix this by printing the correct (unhashed) address.

Thanks to Jessica Yu for helping on this.

CC stable?

Quoted 18 lines
---
 kernel/module.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/module.c +1 -1
index a6e43a5806a1..77ab7211ddef 100644
@@ -1472,7 +1472,7 @@ 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, "%#lx\n", kptr_restrict < 2 ? sattr->address : 0);
 }
 
 static void free_sect_attrs(struct module_sect_attrs *sect_attrs)
#2 lore raw

Em Tue, Apr 17, 2018 at 10:24:35AM +0200, Christian Borntraeger escreveu:

Quoted 29 lines · Thomas Richter
Quoted 26 lines

In kernel v4.16.0 the module .text address is displayed wrong when using /sys/module/*/sections/.text file.
Commit ef0010a30935 ("vsprintf: don't use 'restricted_pointer()' when not restricting")
is the first bad commit.

Here is the issue, using module qeth_l2 on s390 which is the ethernet device driver:

[root@s35lp76 ~]# lsmod
Module Size Used by
qeth_l2 94208 1
...

[root@s35lp76 ~]# cat /proc/modules | egrep '^qeth_l2' qeth_l2 94208 1 - Live 0x000003ff80401000
^ This is the correct address in memory
[root@s35lp76 ~]# cat /sys/module/qeth_l2/sections/.text
0x0000000018ea8363 <---- This is a wrong address
[root@s35lp76 ~]#

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
Quoted 5 lines

Thanks to Jessica Yu for helping on this.

CC stable?

Adding the missing:

Fixes ef0010a30935 ("vsprintf: don't use 'restricted_pointer()' when not restricting")

Should be enough?

- Arnaldo

Quoted 18 lines
Quoted 18 lines
---
 kernel/module.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/module.c +1 -1
index a6e43a5806a1..77ab7211ddef 100644
@@ -1472,7 +1472,7 @@ 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, "%#lx\n", kptr_restrict < 2 ? sattr->address : 0);
 }
 
 static void free_sect_attrs(struct module_sect_attrs *sect_attrs)
#3 lore raw
Quoted 36 lines · Arnaldo Carvalho de Melo

Em Tue, Apr 17, 2018 at 10:24:35AM +0200, Christian Borntraeger escreveu:

Quoted 35 lines · Thomas Richter
Quoted 31 lines

In kernel v4.16.0 the module .text address is displayed wrong when using /sys/module/*/sections/.text file.
Commit ef0010a30935 ("vsprintf: don't use 'restricted_pointer()' when not restricting")
is the first bad commit.

Here is the issue, using module qeth_l2 on s390 which is the ethernet device driver:

[root@s35lp76 ~]# lsmod
Module Size Used by
qeth_l2 94208 1
...

[root@s35lp76 ~]# cat /proc/modules | egrep '^qeth_l2' qeth_l2 94208 1 - Live 0x000003ff80401000
^ This is the correct address in memory
[root@s35lp76 ~]# cat /sys/module/qeth_l2/sections/.text
0x0000000018ea8363 <---- This is a wrong address
[root@s35lp76 ~]#

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.

Quoted 7 lines
Quoted 1 line

CC stable?

Adding the missing:

Fixes ef0010a30935 ("vsprintf: don't use 'restricted_pointer()' when not restricting")

Should be enough?

Even better.

#4 lore raw
In reply to Christian Borntraeger
Quoted 41 lines · Christian Borntraeger
Quoted 24 lines · Thomas Richter

In kernel v4.16.0 the module .text address is displayed wrong when using /sys/module/*/sections/.text file.
Commit ef0010a30935 ("vsprintf: don't use 'restricted_pointer()' when not restricting")
is the first bad commit.

Here is the issue, using module qeth_l2 on s390 which is the ethernet device driver:

[root@s35lp76 ~]# lsmod
Module Size Used by
qeth_l2 94208 1
...

[root@s35lp76 ~]# cat /proc/modules | egrep '^qeth_l2' qeth_l2 94208 1 - Live 0x000003ff80401000
^ This is the correct address in memory
[root@s35lp76 ~]# cat /sys/module/qeth_l2/sections/.text
0x0000000018ea8363 <---- This is a wrong address
[root@s35lp76 ~]#

This breaks the perf tool which uses this address on s390 to calculate start of .text section in memory.

Quoted 7 lines

Fix this by printing the correct (unhashed) address.

Thanks to Jessica Yu for helping on this.

CC stable?

Quoted 4 lines
---
 kernel/module.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 10 lines

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

Quoted 10 lines
kernel/module.c +1 -1
index a6e43a5806a1..77ab7211ddef 100644
@@ -1472,7 +1472,7 @@ 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, "%#lx\n", kptr_restrict < 2 ? sattr->address : 0);

Can we use %px instead, just to make the hash-bypass reports easier to grep for?

-Kees

Quoted 5 lines
Quoted 4 lines
kernel/module.c +0 -0
 }
 
 static void free_sect_attrs(struct module_sect_attrs *sect_attrs)
Signature · 2 lines
Kees Cook
Pixel Security