taint/module: Clean up global and module taint flags handling
PATCH v3 1/1 taint/module: Clean up global and module taint flags handling
The commit 66cc69e34e86a231 ("Fix: module signature vs tracepoints:
add new TAINT_UNSIGNED_MODULE") updated module_taint_flags() to potentially print one more character. But it did not increase the size of the corresponding buffers in m_show() and print_modules().
We have recently done the same mistake when adding a taint flag for livepatching, see
https://lkml.kernel.org/g/cfba2c823bb984690b73572aaae1db596b54a082.1472137475.git.jpoimboe@redhat.com
Also struct module uses an incompatible type for mod-taints flags. It survived from the commit 2bc2d61a9638dab670d ("[PATCH] list module taint flags in Oops/panic"). There was used "int" for the global taint flags at these times. But only the global tain flags was later changed to "unsigned long" by the commit 25ddbb18aae33ad2 ("Make the taint flags reliable").
This patch defines TAINT_FLAGS_COUNT that can be used to create arrays and buffers of the right size. Note that we could not use enum because the taint flag indexes are used also in assembly code.
Then it reworks the table that describes the taint flags. The TAINT_* numbers can be used as the index. Instead, we add information if the taint flag is also shown per-module.
Finally, it uses "unsigned long", bit operations, and the updated taint_flags table also for mod->taints.
It is not optimal because only few taint flags can be printed by module_taint_flags(). But better be on the safe side. IMHO, it is not worth the optimization and this is a good compromise.
---
Changes against v2:
+ fixed a typo in a comment
+ rebased on top of for-next branch from git/jikos/livepatching.git that has the commit commit 2992ef29ae01af9983 ("livepatch/module:
make TAINT_LIVEPATCH module-specific").
Changes against v1:
+ reverted the change to enums because it broke asm code
+ instead, forced the size of the taint_flags table; used taint numbers as the index; used the table also in module.c
+ fixed the type of mod->taints
include/linux/kernel.h | 9 +++++++++ include/linux/module.h | 2 +- kernel/module.c | 33 +++++++++++++------------------ kernel/panic.c | 53 ++++++++++++++++++++++++-------------------------- 4 files changed, 48 insertions(+), 49 deletions(-)
include/linux/kernel.h +9 -0
@@ -509,6 +509,15 @@ extern enum system_states {#define TAINT_UNSIGNED_MODULE 13#define TAINT_SOFTLOCKUP 14#define TAINT_LIVEPATCH 15 +#define TAINT_FLAGS_COUNT 16 + +struct taint_flag { +char true;/* character printed when tainted */ +char false;/* character printed when not tainted */ +bool module;/* also show as a per-module taint flag */ +}; + +extern const struct taint_flag taint_flags[TAINT_FLAGS_COUNT ];extern const char hex_asc[];#define hex_asc_lo (x) hex_asc[((x) & 0x0f)]
include/linux/module.h +1 -1
@@ -399,7 +399,7 @@ struct module {/* Arch-specific module values */ struct mod_arch_specific arch; -unsigned int taints;/* same bits as kernel:tainted */ +unsigned long taints;/* same bits as kernel:taint_flags */ #ifdef CONFIG_GENERIC_BUG /* Support for BUG */
kernel/module.c +13 -20
@@ -330,7 +330,7 @@ static inline void add_taint_module(struct module *mod, unsigned flag, enum lockdep_ok lockdep_ok) {add_taint (flag, lockdep_ok); - mod->taints |= (1U << flag); +set_bit (flag, &mod->taints); }/*
@@ -1138,24 +1138,13 @@ static inline int module_unload_init(struct module *mod)static size_t module_flags_taint (struct module *mod,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)) + buf[l++] = taint_flags[i].true; + } -if (mod->taints & (1 <<TAINT_PROPRIETARY_MODULE )) - buf[l++] ='P' ; -if (mod->taints & (1 <<TAINT_OOT_MODULE )) - buf[l++] ='O' ; -if (mod->taints & (1 <<TAINT_FORCED_MODULE )) - buf[l++] ='F' ; -if (mod->taints & (1 <<TAINT_CRAP )) - buf[l++] ='C' ; -if (mod->taints & (1 <<TAINT_UNSIGNED_MODULE )) - buf[l++] ='E' ; -if (mod->taints & (1 <<TAINT_LIVEPATCH )) - buf[l++] ='K' ; -/* -* TAINT_FORCED_RMMOD: could be added. -* TAINT_CPU_OUT_OF_SPEC, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't -* apply to modules. -*/ return l; }
@@ -4041,6 +4030,10 @@ int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *, }#endif /* CONFIG_KALLSYMS */ +/* Maximum number of characters written by module_flags() */ +#define MODULE_FLAGS_BUF_SIZE (TAINT_FLAGS_COUNT + 4) + +/* Keep in sync with MODULE_FLAGS_BUF_SIZE !!! */ static char *module_flags (struct module *mod,char *buf) {int bx =0 ;
@@ -4085,7 +4078,7 @@ static void m_stop(struct seq_file *m, void *p)static int m_show (struct seq_file *m,void *p) { struct module *mod = list_entry(p, struct module, list); -char buf[8 ]; +char buf[MODULE_FLAGS_BUF_SIZE ];/* We always ignore unformed modules. */ if (mod->state ==MODULE_STATE_UNFORMED )
@@ -4256,7 +4249,7 @@ EXPORT_SYMBOL_GPL(__module_text_address);void print_modules (void ) {struct module *mod; -char buf[8 ]; +char buf[MODULE_FLAGS_BUF_SIZE ];printk (KERN_DEFAULT "Modules linked in:" );/* Most callers should already have preempt disabled, but make sure */
kernel/panic.c +25 -28
71 lines not on this page · raw message
Signature · 1 line
1.8.5.6
Quoted 8 lines · Petr Mladek
The commit
66cc69e34e86a231("Fix: module signature vs tracepoints:
add newTAINT_UNSIGNED_MODULE") updatedmodule_taint_flags()to potentially print one more character. But it did not increase the size of the corresponding buffers inm_show()andprint_modules().We have recently done the same mistake when adding a taint flag for livepatching, see
https://lkml.kernel.org/g/cfba2c823bb984690b73572aaae1db596b54a082.1472137475.git.jpoimboe@redhat.com
No objections to the patch itself, but this link didn't work for me.
Replacing the 'g' with 'r' fixed it:
Or, even better, I think Jiri doesn't rebase his livepatching 'for-next' branch, so maybe just use the commit id:
2992ef29ae01 ("livepatch/module: make TAINT_LIVEPATCH module-specific")
Signature · 1 line
Josh
+++ Petr Mladek [21/09/16 13:47 +0200]:
Quoted 32 lines
The commit
66cc69e34e86a231("Fix: module signature vs tracepoints:
add newTAINT_UNSIGNED_MODULE") updatedmodule_taint_flags()to potentially print one more character. But it did not increase the size of the corresponding buffers inm_show()andprint_modules().We have recently done the same mistake when adding a taint flag for livepatching, see
https://lkml.kernel.org/g/cfba2c823bb984690b73572aaae1db596b54a082.1472137475.git.jpoimboe@redhat.comAlso struct module uses an incompatible type for mod-taints flags. It survived from the commit
2bc2d61a9638dab670d("[PATCH] list module taint flags in Oops/panic"). There was used "int" for the global taint flags at these times. But only the global tain flags was later changed to "unsigned long" by the commit25ddbb18aae33ad2("Make the taint flags reliable").This patch defines
TAINT_FLAGS_COUNTthat can be used to create arrays and buffers of the right size. Note that we could not use enum because the taint flag indexes are used also in assembly code.Then it reworks the table that describes the taint flags. The TAINT_* numbers can be used as the index. Instead, we add information if the taint flag is also shown per-module.
Finally, it uses "unsigned long", bit operations, and the updated
taint_flagstable also formod->taints.It is not optimal because only few taint flags can be printed by
module_taint_flags(). But better be on the safe side. IMHO, it is not worth the optimization and this is a good compromise.Signed-off-by Petr Mladek <[email protected]>
Quoted 8 lines
---
Changes against v2:+ fixed a typo in a comment
+ rebased on top of for-next branch from git/jikos/livepatching.git that has the commit commit
2992ef29ae01af9983("livepatch/module:
makeTAINT_LIVEPATCHmodule-specific").
Hm, quick question, which tree would this patch go to? Though the cleanup is for modules, there is an indirect cross-tree dependency (taint_flag.module needs to be true for TAINT_LIVEPATCH for Josh's patch to still work as intended). The least complicated thing to do would be to just take this through the livepatch tree (with Rusty's approval :-)), no?
Quoted 6 lines · Jessica Yu
Hm, quick question, which tree would this patch go to? Though the cleanup is for modules, there is an indirect cross-tree dependency (taint_flag.module needs to be true for
TAINT_LIVEPATCHfor Josh's patch to still work as intended). The least complicated thing to do would be to just take this through the livepatch tree (with Rusty's approval :-)), no?
That'd be my preference, given there would be an Ack from Rusty coming.
Thanks,
Signature · 2 lines
Jiri Kosina SUSE Labs
Quoted 6 lines · Jessica Yu
Hm, quick question, which tree would this patch go to? Though the cleanup is for modules, there is an indirect cross-tree dependency (taint_flag.module needs to be true for
TAINT_LIVEPATCHfor Josh's patch to still work as intended). The least complicated thing to do would be to just take this through the livepatch tree (with Rusty's approval :-)), no?
I don't want to be sneaking this behind Rusty's back, but he hasn't reposnded so far.
It's not vitally super-crucial to have this present in this very pull request, so I am currently putting this on hold wrt. the upcoming merge window pull request, and we'll then proceeed afterwards once Rusty expressess his (n)ack. If this doesn't happen during the coming weeks, I'll pick this up myself.
Thanks,
Signature · 2 lines
Jiri Kosina SUSE Labs
Quoted 11 lines · Jiri Kosina
Quoted 6 lines · Jessica Yu
Hm, quick question, which tree would this patch go to? Though the cleanup is for modules, there is an indirect cross-tree dependency (taint_flag.module needs to be true for
TAINT_LIVEPATCHfor Josh's patch to still work as intended). The least complicated thing to do would be to just take this through the livepatch tree (with Rusty's approval :-)), no?I don't want to be sneaking this behind Rusty's back, but he hasn't reposnded so far.
I finally side-stepped this by appointing Jessica maintainer, thus her Reviewed-by is sufficient for the module tree.
Lazy, huh?
Sorry for the delay,
Rusty.
Quoted 11 lines
It's not vitally super-crucial to have this present in this very pull request, so I am currently putting this on hold wrt. the upcoming merge window pull request, and we'll then proceeed afterwards once Rusty expressess his (n)ack. If this doesn't happen during the coming weeks, I'll pick this up myself.
Thanks,
Signature · 2 lines
Jiri Kosina SUSE Labs
Quoted 7 lines · Rusty Russell
Quoted 7 lines
Quoted 6 lines
Hm, quick question, which tree would this patch go to? Though the cleanup is for modules, there is an indirect cross-tree dependency (taint_flag.module needs to be true for
TAINT_LIVEPATCHfor Josh's patch to still work as intended). The least complicated thing to do would be to just take this through the livepatch tree (with Rusty's approval :-)), no?
Quoted 5 lines
Quoted 2 lines
I don't want to be sneaking this behind Rusty's back, but he hasn't reposnded so far.
I finally side-stepped this by appointing Jessica maintainer, thus her Reviewed-by is sufficient for the module tree.
Awesome! :)
Quoted 1 line
Lazy, huh?
Laziness has always been the main power behind all the progress of the mankind :P
Jessica, do you want me to take the patch through livepatching tree still, or would you route it yourself now?
Thanks,
Signature · 2 lines
Jiri Kosina SUSE Labs
+++ Jiri Kosina [26/10/16 10:17 +0200]:
Quoted 17 lines · Rusty Russell
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Hm, quick question, which tree would this patch go to? Though the cleanup is for modules, there is an indirect cross-tree dependency (taint_flag.module needs to be true for
TAINT_LIVEPATCHfor Josh's patch to still work as intended). The least complicated thing to do would be to just take this through the livepatch tree (with Rusty's approval :-)), no?Quoted 5 lines
Quoted 2 lines
I don't want to be sneaking this behind Rusty's back, but he hasn't reposnded so far.
I finally side-stepped this by appointing Jessica maintainer, thus her Reviewed-by is sufficient for the module tree.
Awesome! :)
Quoted 7 lines
Quoted 1 line
Lazy, huh?
Laziness has always been the main power behind all the progress of the mankind :P
Jessica, do you want me to take the patch through livepatching tree still, or would you route it yourself now?
Hi Jiri,
Once I'm done fumbling with maintainership logistics, I will take this patch through my tree. :-)
Thanks,
Jessica