kallsyms: fix absolute addresses for kASLR
PATCH 1/1 kallsyms: fix absolute addresses for kASLR
From: Andy Honig <[email protected]>
Currently symbols that are absolute addresses are incorrectly displayed in /proc/kallsyms if the kernel is loaded with kASLR.
The problem was that the scripts/kallsyms.c file which generates the array of symbol names and addresses uses an relocatable value for all symbols, even absolute symbols. This patch fixes that.
Several kallsyms output in different boot states for comparison:
$ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.nokaslr 0000000000000000 D __per_cpu_start 0000000000014280 D __per_cpu_end ffffffff810001c8 T _stext $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr1 000000001f200000 D __per_cpu_start 000000001f214280 D __per_cpu_end ffffffffa02001c8 T _stext $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr2 000000000d400000 D __per_cpu_start 000000000d414280 D __per_cpu_end ffffffff8e4001c8 T _stext $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr-fixed 0000000000000000 D __per_cpu_start 0000000000014280 D __per_cpu_end ffffffffadc001c8 T _stext
--- scripts/kallsyms.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
scripts/kallsyms.c +1 -2
@@ -330,8 +330,7 @@ static void write_src(void)printf ("\tPTR\t_text + %#llx\n" , table[i].addr - _text); else - printf("\tPTR\t_text - %#llx\n", - _text - table[i].addr); + printf("\tPTR\t%#llx\n", table[i].addr); }else {printf ("\tPTR\t%#llx\n" , table[i].addr); }
Signature · 6 lines
1.7.9.5 -- Kees Cook Chrome OS Security
Quoted 8 lines · Kees Cook
From: Andy Honig <[email protected]>
Currently symbols that are absolute addresses are incorrectly displayed in
/proc/kallsymsif the kernel is loaded with kASLR.The problem was that the
scripts/kallsyms.cfile which generates the array of symbol names and addresses uses an relocatable value for all symbols, even absolute symbols. This patch fixes that.
Hi Andy, Kees,
This is not a good patch. See the commit where this was
introduced:
[PATCH] relocatable kernel: Fix kallsyms on avr32 after relocatable kernel changes
o On some platforms like avr32, section init comes before .text and not necessarily a symbol's relative position w.r.t _text is positive. In such cases assembler detects the overflow and emits warning. This patch fixes it.
Did you just break avr32?
And absolute symbols are supposed to be handled in the other branch:
for (i = 0; i < table_cnt; i++) {
if (toupper(table[i].sym[0]) != 'A') {
if (_text <= table[i].addr)
printf("\tPTR\t_text + %#llx\n",
table[i].addr - _text);
else
printf("\tPTR\t_text - %#llx\n",
_text - table[i].addr);
} else {
printf("\tPTR\t%#llx\n", table[i].addr);
}
}__per_cpu_start is not an absolute symbol anyway.
You need to fix this properly.
Rusty.
Quoted 39 lines
Several kallsyms output in different boot states for comparison:
$ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.nokaslr 0000000000000000 D __per_cpu_start 0000000000014280 D __per_cpu_end ffffffff810001c8 T _stext $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr1 000000001f200000 D __per_cpu_start 000000001f214280 D __per_cpu_end ffffffffa02001c8 T _stext $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr2 000000000d400000 D __per_cpu_start 000000000d414280 D __per_cpu_end ffffffff8e4001c8 T _stext $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr-fixed 0000000000000000 D __per_cpu_start 0000000000014280 D __per_cpu_end ffffffffadc001c8 T _stextSigned-off-by Andy Honig <[email protected]>Signed-off-by Kees Cook <[email protected]>--- scripts/kallsyms.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)scripts/kallsyms.c +1
-2@@ -330,8 +330,7 @@ static void write_src(void)printf ("\tPTR\t_text + %#llx\n" , table[i].addr - _text); else - printf("\tPTR\t_text - %#llx\n", - _text - table[i].addr); + printf("\tPTR\t%#llx\n", table[i].addr); }else {printf ("\tPTR\t%#llx\n" , table[i].addr); }
Quoted 39 lines · Rusty Russell
Quoted 8 lines · Kees Cook
From: Andy Honig <[email protected]>
Currently symbols that are absolute addresses are incorrectly displayed in
/proc/kallsymsif the kernel is loaded with kASLR.The problem was that the
scripts/kallsyms.cfile which generates the array of symbol names and addresses uses an relocatable value for all symbols, even absolute symbols. This patch fixes that.Hi Andy, Kees,
This is not a good patch. See the commit where this was
introduced:[PATCH] relocatable kernel: Fix kallsyms on avr32 after relocatable kernel changes
o On some platforms like avr32, section init comes before .text and not necessarily a symbol's relative position w.r.t
_textis positive. In such cases assembler detects the overflow and emits warning. This patch fixes it.Did you just break avr32?
And absolute symbols are supposed to be handled in the other branch:
for (i = 0; i < table_cnt; i++) { if (toupper(table[i].sym[0]) != 'A') { if (_text <= table[i].addr) printf("\tPTR\t_text + %#llx\n", table[i].addr - _text); else printf("\tPTR\t_text - %#llx\n", _text - table[i].addr); } else { printf("\tPTR\t%#llx\n", table[i].addr); } }
Quoted 4 lines
__per_cpu_startis not an absolute symbol anyway.You need to fix this properly.
Rusty.
Hm, yeah, it seems we need another class of variable. The per_cpu stuff is technically relative, but it's not relocated, since it's not relative to the text location. We'll see how to do this more sanely.
Thanks!
-Kees
Signature · 2 lines
Kees Cook Chrome OS Security