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

Use 'E' instead of 'X' for unsigned module taint flag.

Browse Source 
Takashi Iwai <tiwai@suse.de> says:
> The letter 'X' has been already used for SUSE kernels for very long
> time, to indicate the external supported modules.  Can the new flag be
> changed to another letter for avoiding conflict...?
> (BTW, we also use 'N' for "no support", too.)

Note: this code should be cleaned up, so we don't have such maps in
three places!

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2014-03-31 14:39:57 +10:30
parent 58f86cc89c
commit 57673c2b0b
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/ABI/testing/sysfs-module
View File

@ -49,4 +49,4 @@ Description: Module taint flags:
O - out-of-tree module O - out-of-tree module
F - force-loaded module F - force-loaded module
C - staging driver module C - staging driver module
X - unsigned module E - unsigned module

2
Documentation/module-signing.txt
View File

@ -54,7 +54,7 @@ This has a number of options available:
If this is off (ie. "permissive"), then modules for which the key is not If this is off (ie. "permissive"), then modules for which the key is not
available and modules that are unsigned are permitted, but the kernel will available and modules that are unsigned are permitted, but the kernel will
be marked as being tainted, and the concerned modules will be marked as be marked as being tainted, and the concerned modules will be marked as
tainted, shown with the character 'X'. tainted, shown with the character 'E'.
If this is on (ie. "restrictive"), only modules that have a valid If this is on (ie. "restrictive"), only modules that have a valid
signature that can be verified by a public key in the kernel's possession signature that can be verified by a public key in the kernel's possession

2
Documentation/oops-tracing.txt
View File

@ -265,7 +265,7 @@ characters, each representing a particular tainted value.
13: 'O' if an externally-built ("out-of-tree") module has been loaded. 13: 'O' if an externally-built ("out-of-tree") module has been loaded.
14: 'X' if an unsigned module has been loaded in a kernel supporting 14: 'E' if an unsigned module has been loaded in a kernel supporting
module signature. module signature.
The primary reason for the 'Tainted: ' string is to tell kernel The primary reason for the 'Tainted: ' string is to tell kernel

2
kernel/module.c
View File

@ -1014,7 +1014,7 @@ static size_t module_flags_taint(struct module *mod, char *buf)
if (mod->taints & (1 << TAINT_CRAP)) if (mod->taints & (1 << TAINT_CRAP))
buf[l++] = 'C'; buf[l++] = 'C';
if (mod->taints & (1 << TAINT_UNSIGNED_MODULE)) if (mod->taints & (1 << TAINT_UNSIGNED_MODULE))
buf[l++] = 'X'; buf[l++] = 'E';
/* /*
* TAINT_FORCED_RMMOD: could be added. * TAINT_FORCED_RMMOD: could be added.
* TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't

4
kernel/panic.c
View File

@ -210,7 +210,7 @@ static const struct tnt tnts[] = {
{ TAINT_CRAP, 'C', ' ' }, { TAINT_CRAP, 'C', ' ' },
{ TAINT_FIRMWARE_WORKAROUND, 'I', ' ' }, { TAINT_FIRMWARE_WORKAROUND, 'I', ' ' },
{ TAINT_OOT_MODULE, 'O', ' ' }, { TAINT_OOT_MODULE, 'O', ' ' },
{ TAINT_UNSIGNED_MODULE, 'X', ' ' }, { TAINT_UNSIGNED_MODULE, 'E', ' ' },
}; };
/** /**
@ -229,7 +229,7 @@ static const struct tnt tnts[] = {
* 'C' - modules from drivers/staging are loaded. * 'C' - modules from drivers/staging are loaded.
* 'I' - Working around severe firmware bug. * 'I' - Working around severe firmware bug.
* 'O' - Out-of-tree module has been loaded. * 'O' - Out-of-tree module has been loaded.
* 'X' - Unsigned module has been loaded. * 'E' - Unsigned module has been loaded.
* *
* The string is overwritten by the next call to print_tainted(). * The string is overwritten by the next call to print_tainted().
*/ */