kallsyms: Fix segfault in prefix_underscores_count().
PATCH 1/1 kallsyms: Fix segfault in prefix_underscores_count().
[ I'm not sure who exactly this should go to, so I've attempted to get all of
the interested parties in the Cc. ]
This is a re-send of a problem that I reported on August 7th, both Sam and Lai have been unresponsive, so hopefully someone else can take a look at this.
Commit b478b782e110fdb4135caa3062b6d687e989d994 "kallsyms, tracing:
output more proper symbol name" introduces a "bugfix" that introduces a segfault in kallsyms in my configurations.
The cause is the introduction of prefix_underscores_count() which attempts to count underscores, even in symbols that do not have them. As a result, it just uselessly runs past the end of the buffer until it crashes:
CC init/version.o LD init/built-in.o LD .tmp_vmlinux1 KSYM .tmp_kallsyms1.S
/bin/sh: line 1: 16934 Done sh-linux-gnu-nm -n .tmp_vmlinux1
16935 Segmentation fault | scripts/kallsyms > .tmp_kallsyms1.S
make: *** [.tmp_kallsyms1.S] Error 139
This adds a strlen iterator that bails out if nothing is found in the string, which fixes up the observed segfaults.
---
I've uploaded a sample problematic symbol list to:
http://userweb.kernel.org/~lethal/symbol-list.gz
that one can pipe in to scripts/kallsyms to reproduce the fault, incase someone wants to make a better fix. I'm at a loss as to why no one else has reported this yet.
scripts/kallsyms.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
scripts/kallsyms.c +6 -1
@@ -584,9 +538,14 @@ static int may_be_linker_script_provide_symbol(const struct sym_entry *se)static int prefix_underscores_count (const char *str) {const char *tail = str; +size_t len =strlen (str); + +while (*tail !='_' ) { +if (!len--) +return 0 ; -while (*tail !='_' ) tail++; + }return tail - str; }
Quoted 6 lines · Paul Mundt
[ I'm not sure who exactly this should go to, so I've attempted to get all of
the interested parties in the Cc. ]This is a re-send of a problem that I reported on August 7th, both Sam and Lai have been unresponsive, so hopefully someone else can take a look at this.
Lai is off office and won't be back in 2 weeks, so I'm afraid he won't be responsive..
Quoted 9 lines
Commit
b478b782e110fdb4135caa3062b6d687e989d994"kallsyms, tracing:
output more proper symbol name" introduces a "bugfix" that introduces a segfault in kallsyms in my configurations.The cause is the introduction of
prefix_underscores_count()which attempts to count underscores, even in symbols that do not have them. As a result, it just uselessly runs past the end of the buffer until it crashes:
But the fix looks obviously correct, as long as @str is guaranteed to be NULL-terminated.
...
scripts/kallsyms.c static int may_be_linker_script_provide_symbol(const struct sym_entry *se) · line 548
Quoted 13 lines
scripts/kallsyms.c +6
-1@@ -584,9 +538,14 @@ static int may_be_linker_script_provide_symbol(const struct sym_entry *se)static int prefix_underscores_count (const char *str) {const char *tail = str; +size_t len =strlen (str); + +while (*tail !='_' ) { +if (!len--) +return 0 ; -while (*tail !='_' ) tail++; + }
Can be simplified as:
while (*tail != '\0' && *tail != '_') tail++;
But..as the name "prefix_underscores_count" suggests, shouldn't it be:
while (*tail == '_') tail++;
??
Quoted 3 lines
scripts/kallsyms.c +0
-0return tail - str; }
Quoted 31 lines · Li Zefan
Quoted 9 lines · Paul Mundt
Commit
b478b782e110fdb4135caa3062b6d687e989d994"kallsyms, tracing:
output more proper symbol name" introduces a "bugfix" that introduces a segfault in kallsyms in my configurations.The cause is the introduction of
prefix_underscores_count()which attempts to count underscores, even in symbols that do not have them. As a result, it just uselessly runs past the end of the buffer until it crashes:But the fix looks obviously correct, as long as @str is guaranteed to be NULL-terminated.
...
Review static int may_be_linker_script_provide_symbol(const struct sym_entry *se) · line 548
Quoted 13 lines
(quoted diff) +6
-1@@ -584,9 +538,14 @@ static int may_be_linker_script_provide_symbol(const struct sym_entry *se) static int prefix_underscores_count(const char *str) { const char *tail = str; + size_t len = strlen(str); + + while (*tail != '_') { + if (!len--) + return 0; - while (*tail != '_') tail++; + }Can be simplified as:
Quoted 9 lines
while (*tail != '\0' && *tail != '_') tail++;But..as the name "
prefix_underscores_count" suggests, shouldn't it be:while (*tail == '_') tail++;??
Yes, that was what I did initially as well, but the behaviour is not exactly the same, and I wanted an explanation from Lai if there were some other intentions for the code. In any event, simplifying it still manages to do the right thing, so I'm fine with that.
------------------------
Subject: [PATCH] kallsyms: Fix segfault in prefix_underscores_count().
Commit b478b782e110fdb4135caa3062b6d687e989d994 "kallsyms, tracing:
output more proper symbol name" introduces a "bugfix" that introduces a segfault in kallsyms in my configurations.
The cause is the introduction of prefix_underscores_count() which attempts to count underscores, even in symbols that do not have them. As a result, it just uselessly runs past the end of the buffer until it crashes:
CC init/version.o LD init/built-in.o LD .tmp_vmlinux1 KSYM .tmp_kallsyms1.S
/bin/sh: line 1: 16934 Done sh-linux-gnu-nm -n .tmp_vmlinux1
16935 Segmentation fault | scripts/kallsyms > .tmp_kallsyms1.S
make: *** [.tmp_kallsyms1.S] Error 139
This simplifies the logic and just does a straightforward count.
---
scripts/kallsyms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/kallsyms.c +1 -1
@@ -585,7 +585,7 @@ static int prefix_underscores_count(const char *str) {const char *tail = str; -while (*tail !='_' ) +while (*tail =='_' ) tail++;return tail - str;
Li Zefan
Reviewed-byQuoted 11 lines
Quoted 6 lines
But..as the name "
prefix_underscores_count" suggests, shouldn't it be:while (*tail == '_') tail++;??
Yes, that was what I did initially as well, but the behaviour is not exactly the same, and I wanted an explanation from Lai if there were some other intentions for the code. In any event, simplifying it still manages to do the right thing, so I'm fine with that.
I know what happened.
Lai sent this patch:
http://lkml.org/lkml/2009/3/13/72
And he himself found the bug, and fixed it and resent it:
http://lkml.org/lkml/2009/3/13/156
But Andrew mistakenly picked up the former one.
Quoted 16 lines
------------------------
Subject: [PATCH] kallsyms: Fix segfault inprefix_underscores_count().Commit
b478b782e110fdb4135caa3062b6d687e989d994"kallsyms, tracing:
output more proper symbol name" introduces a "bugfix" that introduces a segfault in kallsyms in my configurations.The cause is the introduction of
prefix_underscores_count()which attempts to count underscores, even in symbols that do not have them. As a result, it just uselessly runs past the end of the buffer until it crashes:CC init/version.o LD init/built-in.o LD .tmp_vmlinux1 KSYM .tmp_kallsyms1.S
Quoted 8 lines
/bin/sh: line 1: 16934 Done sh-linux-gnu-nm -n .tmp_vmlinux1
16935 Segmentation fault |scripts/kallsyms>.tmp_kallsyms1.S
make: *** [.tmp_kallsyms1.S] Error 139This simplifies the logic and just does a straightforward count.
Signed-off-by Paul Mundt <[email protected]>