diff options
| author | Rene Herman <rene.herman@keyaccess.nl> | 2008-08-11 19:20:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 19:40:38 +0200 |
| commit | 48d97cb65e62a5f1122ac2cf1149800d4f4693e8 (patch) | |
| tree | 20f9ccaeeb89eebec0444fb3eb45ebaa6f2c3525 | |
| parent | b0fbaa6b5976962434349849673b9ff63631b6d4 (diff) | |
| download | op-kernel-dev-48d97cb65e62a5f1122ac2cf1149800d4f4693e8.zip op-kernel-dev-48d97cb65e62a5f1122ac2cf1149800d4f4693e8.tar.gz | |
x86: make "apic" an early_param() on 32-bit, NULL check
Cyrill Gorcunov observed:
> you turned it into early_param so now it's NULL injecting vulnerabled.
> Could you please add checking for NULL str param?
fix that.
Also, change the name of 'str' into 'arg', to make it more apparent
that this is an optional argument that can be NULL, not a string
parameter that is empty when unset.
Reported-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/apic_32.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index f432d48..039a8d4 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c @@ -1720,12 +1720,16 @@ static int __init parse_lapic_timer_c2_ok(char *arg) } early_param("lapic_timer_c2_ok", parse_lapic_timer_c2_ok); -static int __init apic_set_verbosity(char *str) +static int __init apic_set_verbosity(char *arg) { - if (strcmp("debug", str) == 0) + if (!arg) + return -EINVAL; + + if (strcmp(arg, "debug") == 0) apic_verbosity = APIC_DEBUG; - else if (strcmp("verbose", str) == 0) + else if (strcmp(arg, "verbose") == 0) apic_verbosity = APIC_VERBOSE; + return 0; } early_param("apic", apic_set_verbosity); |
