Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kallsyms: generalize address range checking

Browse source 
This refactors the address range checks to be generalized instead of
specific to text range checks, in preparation for other range checks.
Also extracts logic for "is the symbol absolute" into a function.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Kees Cook 2014-03-17 13:18:27 +10:30 committed by Rusty Russell
parent 0283f9a529
commit 78eb71594b
1 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
scripts/kallsyms.c
View file

@ -36,13 +36,13 @@ struct sym_entry {
unsigned char *sym; unsigned char *sym;
}; };
struct text_range { struct addr_range {
const char *stext, *etext; const char *start_sym, *end_sym;
unsigned long long start, end; unsigned long long start, end;
}; };
static unsigned long long _text; static unsigned long long _text;
static struct text_range text_ranges[] = { static struct addr_range text_ranges[] = {
{ "_stext", "_etext" }, { "_stext", "_etext" },
{ "_sinittext", "_einittext" }, { "_sinittext", "_einittext" },
{ "_stext_l1", "_etext_l1" }, /* Blackfin on-chip L1 inst SRAM */ { "_stext_l1", "_etext_l1" }, /* Blackfin on-chip L1 inst SRAM */
@ -83,19 +83,20 @@ static inline int is_arm_mapping_symbol(const char *str)
&& (str[2] == '\0' || str[2] == '.'); && (str[2] == '\0' || str[2] == '.');
} }
static int read_symbol_tr(const char *sym, unsigned long long addr) static int check_symbol_range(const char *sym, unsigned long long addr,
struct addr_range *ranges, int entries)
{ {
size_t i; size_t i;
struct text_range *tr; struct addr_range *ar;
for (i = 0; i < ARRAY_SIZE(text_ranges); ++i) { for (i = 0; i < entries; ++i) {
tr = &text_ranges[i]; ar = &ranges[i];
if (strcmp(sym, tr->stext) == 0) { if (strcmp(sym, ar->start_sym) == 0) {
tr->start = addr; ar->start = addr;
return 0; return 0;
} else if (strcmp(sym, tr->etext) == 0) { } else if (strcmp(sym, ar->end_sym) == 0) {
tr->end = addr; ar->end = addr;
return 0; return 0;
} }
} }
@ -130,7 +131,8 @@ static int read_symbol(FILE *in, struct sym_entry *s)
/* Ignore most absolute/undefined (?) symbols. */ /* Ignore most absolute/undefined (?) symbols. */
if (strcmp(sym, "_text") == 0) if (strcmp(sym, "_text") == 0)
_text = s->addr; _text = s->addr;
else if (read_symbol_tr(sym, s->addr) == 0) else if (check_symbol_range(sym, s->addr, text_ranges,
ARRAY_SIZE(text_ranges)) == 0)
/* nothing to do */; /* nothing to do */;
else if (toupper(stype) == 'A') else if (toupper(stype) == 'A')
{ {
@ -167,15 +169,16 @@ static int read_symbol(FILE *in, struct sym_entry *s)
return 0; return 0;
} }
static int symbol_valid_tr(struct sym_entry *s) static int symbol_in_range(struct sym_entry *s, struct addr_range *ranges,
int entries)
{ {
size_t i; size_t i;
struct text_range *tr; struct addr_range *ar;
for (i = 0; i < ARRAY_SIZE(text_ranges); ++i) { for (i = 0; i < entries; ++i) {
tr = &text_ranges[i]; ar = &ranges[i];
if (s->addr >= tr->start && s->addr <= tr->end) if (s->addr >= ar->start && s->addr <= ar->end)
return 1; return 1;
} }
@ -214,7 +217,8 @@ static int symbol_valid(struct sym_entry *s)
/* if --all-symbols is not specified, then symbols outside the text /* if --all-symbols is not specified, then symbols outside the text
* and inittext sections are discarded */ * and inittext sections are discarded */
if (!all_symbols) { if (!all_symbols) {
if (symbol_valid_tr(s) == 0) if (symbol_in_range(s, text_ranges,
ARRAY_SIZE(text_ranges)) == 0)
return 0; return 0;
/* Corner case. Discard any symbols with the same value as /* Corner case. Discard any symbols with the same value as
* _etext _einittext; they can move between pass 1 and 2 when * _etext _einittext; they can move between pass 1 and 2 when
@ -223,9 +227,11 @@ static int symbol_valid(struct sym_entry *s)
* rules. * rules.
*/ */
if ((s->addr == text_range_text->end && if ((s->addr == text_range_text->end &&
strcmp((char *)s->sym + offset, text_range_text->etext)) || strcmp((char *)s->sym + offset,
text_range_text->end_sym)) ||
(s->addr == text_range_inittext->end && (s->addr == text_range_inittext->end &&
strcmp((char *)s->sym + offset, text_range_inittext->etext))) strcmp((char *)s->sym + offset,
text_range_inittext->end_sym)))
return 0; return 0;
} }
@ -298,6 +304,11 @@ static int expand_symbol(unsigned char *data, int len, char *result)
return total; return total;
} }
static int symbol_absolute(struct sym_entry *s)
{
return toupper(s->sym[0]) == 'A';
}
static void write_src(void) static void write_src(void)
{ {
unsigned int i, k, off; unsigned int i, k, off;
@ -325,7 +336,7 @@ static void write_src(void)
*/ */
output_label("kallsyms_addresses"); output_label("kallsyms_addresses");
for (i = 0; i < table_cnt; i++) { for (i = 0; i < table_cnt; i++) {
if (toupper(table[i].sym[0]) != 'A') { if (!symbol_absolute(&table[i])) {
if (_text <= table[i].addr) if (_text <= table[i].addr)
printf("\tPTR\t_text + %#llx\n", printf("\tPTR\t_text + %#llx\n",
table[i].addr - _text); table[i].addr - _text);