iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

taint/module: Fix problems when out-of-kernel driver defines true or false

Browse Source 
Commit 7fd8329ba502 ("taint/module: Clean up global and module taint
flags handling") used the key words true and false as character members
of a new struct. These names cause problems when out-of-kernel modules
such as VirtualBox include their own definitions of true and false.

Fixes: 7fd8329ba502 ("taint/module: Clean up global and module taint flags handling")
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Jessica Yu <jeyu@redhat.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Reported-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Jessica Yu <jeyu@redhat.com>
This commit is contained in:
Larry Finger 2017-01-01 20:25:25 -06:00 committed by Jessica Yu
parent 0c744ea4f7
commit 5eb7c0d04f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/kernel.h
View File

@ -514,8 +514,8 @@ extern enum system_states {
#define TAINT_FLAGS_COUNT 16 #define TAINT_FLAGS_COUNT 16
struct taint_flag { struct taint_flag {
char true; /* character printed when tainted */ char c_true; /* character printed when tainted */
char false; /* character printed when not tainted */ char c_false; /* character printed when not tainted */
bool module; /* also show as a per-module taint flag */ bool module; /* also show as a per-module taint flag */
}; };

2
kernel/module.c
View File

@ -1145,7 +1145,7 @@ static size_t module_flags_taint(struct module *mod, char *buf)
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, &mod->taints))
buf[l++] = taint_flags[i].true; buf[l++] = taint_flags[i].c_true;
} }
return l; return l;

2
kernel/panic.c
View File

@ -355,7 +355,7 @@ const char *print_tainted(void)
for (i = 0; i < TAINT_FLAGS_COUNT; i++) { for (i = 0; i < TAINT_FLAGS_COUNT; i++) {
const struct taint_flag *t = &taint_flags[i]; const struct taint_flag *t = &taint_flags[i];
*s++ = test_bit(i, &tainted_mask) ? *s++ = test_bit(i, &tainted_mask) ?
t->true : t->false; t->c_true : t->c_false;
} }
*s = 0; *s = 0;
} else } else