ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

module: Make module_flags_taint() accept a module's taints bitmap and usable outside core code

Browse Source 
No functional change.

The purpose of this patch is to modify module_flags_taint() to accept
a module's taints bitmap as a parameter and modifies all users
accordingly. Furthermore, it is now possible to access a given
module's taint flags data outside of non-essential code yet does
remain for internal use only.

This is in preparation for module unload taint tracking support.

Signed-off-by: Aaron Tomlin <atomlin@redhat.com>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
This commit is contained in:
Aaron Tomlin
2022-05-02 21:51:03 +01:00
committed by Luis Chamberlain
parent 80140a81f7
commit c14e522bc7
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/module/internal.h
View File

@@ -100,6 +100,7 @@ int cmp_name(const void *name, const void *sym);
long module_get_offset(struct module *mod, unsigned int *size, Elf_Shdr *sechdr, long module_get_offset(struct module *mod, unsigned int *size, Elf_Shdr *sechdr,
unsigned int section); unsigned int section);
char *module_flags(struct module *mod, char *buf); char *module_flags(struct module *mod, char *buf);
size_t module_flags_taint(unsigned long taints, char *buf);
static inline unsigned long kernel_symbol_value(const struct kernel_symbol *sym) static inline unsigned long kernel_symbol_value(const struct kernel_symbol *sym)
{ {

8
kernel/module/main.c
View File

@@ -890,13 +890,13 @@ static inline int module_unload_init(struct module *mod)
} }
#endif /* CONFIG_MODULE_UNLOAD */ #endif /* CONFIG_MODULE_UNLOAD */
static size_t module_flags_taint(struct module *mod, char *buf) size_t module_flags_taint(unsigned long taints, char *buf)
{ {
size_t l = 0; size_t l = 0;
int i; int i;
for (i = 0; i < TAINT_FLAGS_COUNT; i++) { for (i = 0; i < TAINT_FLAGS_COUNT; i++) {
if (taint_flags[i].module && test_bit(i, &mod->taints)) if (taint_flags[i].module && test_bit(i, &taints))
buf[l++] = taint_flags[i].c_true; buf[l++] = taint_flags[i].c_true;
} }
@@ -974,7 +974,7 @@ static ssize_t show_taint(struct module_attribute *mattr,
{ {
size_t l; size_t l;
l = module_flags_taint(mk->mod, buffer); l = module_flags_taint(mk->mod->taints, buffer);
buffer[l++] = '\n'; buffer[l++] = '\n';
return l; return l;
} }
@@ -2993,7 +2993,7 @@ char *module_flags(struct module *mod, char *buf)
mod->state == MODULE_STATE_GOING || mod->state == MODULE_STATE_GOING ||
mod->state == MODULE_STATE_COMING) { mod->state == MODULE_STATE_COMING) {
buf[bx++] = '('; buf[bx++] = '(';
bx += module_flags_taint(mod, buf + bx); bx += module_flags_taint(mod->taints, buf + bx);
/* Show a - for module-is-being-unloaded */ /* Show a - for module-is-being-unloaded */
if (mod->state == MODULE_STATE_GOING) if (mod->state == MODULE_STATE_GOING)
buf[bx++] = '-'; buf[bx++] = '-';