Skip to content

Commit 4f521ba

Browse files
maninder42mcgrof
authored andcommitted
kallsyms: remove unsed API lookup_symbol_attrs
with commit '7878c231dae0 ("slab: remove /proc/slab_allocators")' lookup_symbol_attrs usage is removed. Thus removing redundant API. Signed-off-by: Maninder Singh <[email protected]> Reviewed-by: Kees Cook <[email protected]> Signed-off-by: Luis Chamberlain <[email protected]>
1 parent 15d5daa commit 4f521ba

File tree

4 files changed

+0
-71
lines changed

4 files changed

+0
-71
lines changed

include/linux/kallsyms.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ extern int sprint_backtrace(char *buffer, unsigned long address);
9393
extern int sprint_backtrace_build_id(char *buffer, unsigned long address);
9494

9595
int lookup_symbol_name(unsigned long addr, char *symname);
96-
int lookup_symbol_attrs(unsigned long addr, unsigned long *size, unsigned long *offset, char *modname, char *name);
9796

9897
/* How and when do we show kallsyms values? */
9998
extern bool kallsyms_show_value(const struct cred *cred);
@@ -155,11 +154,6 @@ static inline int lookup_symbol_name(unsigned long addr, char *symname)
155154
return -ERANGE;
156155
}
157156

158-
static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, unsigned long *offset, char *modname, char *name)
159-
{
160-
return -ERANGE;
161-
}
162-
163157
static inline bool kallsyms_show_value(const struct cred *cred)
164158
{
165159
return false;

include/linux/module.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -968,15 +968,6 @@ static inline int lookup_module_symbol_name(unsigned long addr, char *symname)
968968
return -ERANGE;
969969
}
970970

971-
static inline int lookup_module_symbol_attrs(unsigned long addr,
972-
unsigned long *size,
973-
unsigned long *offset,
974-
char *modname,
975-
char *name)
976-
{
977-
return -ERANGE;
978-
}
979-
980971
static inline int module_get_kallsym(unsigned int symnum, unsigned long *value,
981972
char *type, char *name,
982973
char *module_name, int *exported)

kernel/kallsyms.c

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -484,34 +484,6 @@ int lookup_symbol_name(unsigned long addr, char *symname)
484484
return 0;
485485
}
486486

487-
int lookup_symbol_attrs(unsigned long addr, unsigned long *size,
488-
unsigned long *offset, char *modname, char *name)
489-
{
490-
int res;
491-
492-
name[0] = '\0';
493-
name[KSYM_NAME_LEN - 1] = '\0';
494-
495-
if (is_ksym_addr(addr)) {
496-
unsigned long pos;
497-
498-
pos = get_symbol_pos(addr, size, offset);
499-
/* Grab name */
500-
kallsyms_expand_symbol(get_symbol_offset(pos),
501-
name, KSYM_NAME_LEN);
502-
modname[0] = '\0';
503-
goto found;
504-
}
505-
/* See if it's in a module. */
506-
res = lookup_module_symbol_attrs(addr, size, offset, modname, name);
507-
if (res)
508-
return res;
509-
510-
found:
511-
cleanup_symbol_name(name);
512-
return 0;
513-
}
514-
515487
/* Look up a kernel symbol and return it in a text buffer. */
516488
static int __sprint_symbol(char *buffer, unsigned long address,
517489
int symbol_offset, int add_offset, int add_buildid)

kernel/module/kallsyms.c

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -381,34 +381,6 @@ int lookup_module_symbol_name(unsigned long addr, char *symname)
381381
return -ERANGE;
382382
}
383383

384-
int lookup_module_symbol_attrs(unsigned long addr, unsigned long *size,
385-
unsigned long *offset, char *modname, char *name)
386-
{
387-
struct module *mod;
388-
389-
preempt_disable();
390-
list_for_each_entry_rcu(mod, &modules, list) {
391-
if (mod->state == MODULE_STATE_UNFORMED)
392-
continue;
393-
if (within_module(addr, mod)) {
394-
const char *sym;
395-
396-
sym = find_kallsyms_symbol(mod, addr, size, offset);
397-
if (!sym)
398-
goto out;
399-
if (modname)
400-
strscpy(modname, mod->name, MODULE_NAME_LEN);
401-
if (name)
402-
strscpy(name, sym, KSYM_NAME_LEN);
403-
preempt_enable();
404-
return 0;
405-
}
406-
}
407-
out:
408-
preempt_enable();
409-
return -ERANGE;
410-
}
411-
412384
int module_get_kallsym(unsigned int symnum, unsigned long *value, char *type,
413385
char *name, char *module_name, int *exported)
414386
{

0 commit comments

Comments
 (0)