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

lwfinger · Jessica Yu · commit 5eb7c0d04f04 · 2017-01-17T10:56:45.000-08:00
Commit 7fd8329 ("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: 7fd8329 ("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>
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
@@ -514,8 +514,8 @@ extern enum system_states {
 #define TAINT_FLAGS_COUNT		16
 
 struct taint_flag {
-	char true;	/* character printed when tainted */
-	char false;	/* character printed when not tainted */
+	char c_true;	/* character printed when tainted */
+	char c_false;	/* character printed when not tainted */
 	bool module;	/* also show as a per-module taint flag */
 };
 
diff --git a/kernel/module.c b/kernel/module.c
@@ -1145,7 +1145,7 @@ static size_t module_flags_taint(struct module *mod, char *buf)
 
 	for (i = 0; i < TAINT_FLAGS_COUNT; i++) {
 		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;
diff --git a/kernel/panic.c b/kernel/panic.c
@@ -355,7 +355,7 @@ const char *print_tainted(void)
 		for (i = 0; i < TAINT_FLAGS_COUNT; i++) {
 			const struct taint_flag *t = &taint_flags[i];
 			*s++ = test_bit(i, &tainted_mask) ?
-					t->true : t->false;
+					t->c_true : t->c_false;
 		}
 		*s = 0;
 	} else

Original file line number	Diff line number	Diff line change
`@@ -1145,7 +1145,7 @@ static size_t module_flags_taint(struct module mod, char buf)`
`1145`	`1145`
`1146`	`1146`	`for (i = 0; i < TAINT_FLAGS_COUNT; i++) {`
`1147`	`1147`	`if (taint_flags[i].module && test_bit(i, &mod->taints))`
`1148`		`- buf[l++] = taint_flags[i].true;`
	`1148`	`+ buf[l++] = taint_flags[i].c_true;`
`1149`	`1149`	`}`
`1150`	`1150`
`1151`	`1151`	`return l;`
Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ const char *print_tainted(void)`
`355`	`355`	`for (i = 0; i < TAINT_FLAGS_COUNT; i++) {`
`356`	`356`	`const struct taint_flag *t = &taint_flags[i];`
`357`	`357`	`*s++ = test_bit(i, &tainted_mask) ?`
`358`		`- t->true : t->false;`
	`358`	`+ t->c_true : t->c_false;`
`359`	`359`	`}`
`360`	`360`	`*s = 0;`
`361`	`361`	`} else`