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

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>

diff --git a/kernel/module/internal.h b/kernel/module/internal.h
index 3e23bef5884df7db1fb4d39b089055cfc91db394..abbd1c5ef264ab529c9308940317a4c63ee9ad95 100644 (file)
--- a/kernel/module/internal.h
+++ b/kernel/module/internal.h
@@ -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,
                       unsigned int section);
 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)
 {

diff --git a/kernel/module/main.c b/kernel/module/main.c
index 05a42d8fcd7a8b6b432feba06f9475eb26b57427..7dbdd098b995183f11386353950274c9dba8d800 100644 (file)
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -890,13 +890,13 @@ static inline int module_unload_init(struct module *mod)
 }
 #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;
        int 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;
        }
 
@@ -974,7 +974,7 @@ static ssize_t show_taint(struct module_attribute *mattr,
 {
        size_t l;
 
-       l = module_flags_taint(mk->mod, buffer);
+       l = module_flags_taint(mk->mod->taints, buffer);
        buffer[l++] = '\n';
        return l;
 }
@@ -2993,7 +2993,7 @@ char *module_flags(struct module *mod, char *buf)
            mod->state == MODULE_STATE_GOING ||
            mod->state == MODULE_STATE_COMING) {
                buf[bx++] = '(';
-               bx += module_flags_taint(mod, buf + bx);
+               bx += module_flags_taint(mod->taints, buf + bx);
                /* Show a - for module-is-being-unloaded */
                if (mod->state == MODULE_STATE_GOING)
                        buf[bx++] = '-';