lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 16 Nov 2018 17:53:44 -0800 From: Tim Chen <tim.c.chen@...ux.intel.com> To: Jiri Kosina <jikos@...nel.org>, Thomas Gleixner <tglx@...utronix.de> Cc: Tim Chen <tim.c.chen@...ux.intel.com>, Tom Lendacky <thomas.lendacky@....com>, Ingo Molnar <mingo@...hat.com>, Peter Zijlstra <peterz@...radead.org>, Josh Poimboeuf <jpoimboe@...hat.com>, Andrea Arcangeli <aarcange@...hat.com>, David Woodhouse <dwmw@...zon.co.uk>, Andi Kleen <ak@...ux.intel.com>, Dave Hansen <dave.hansen@...el.com>, Casey Schaufler <casey.schaufler@...el.com>, Asit Mallick <asit.k.mallick@...el.com>, Arjan van de Ven <arjan@...ux.intel.com>, Jon Masters <jcm@...hat.com>, Waiman Long <longman9394@...il.com>, linux-kernel@...r.kernel.org, x86@...nel.org Subject: [Patch v5 01/16] x86/speculation: Clean up spectre_v2_parse_cmdline() Remove unnecessary else statement in spectre_v2_parse_cmdline() to save a indentation level. Signed-off-by: Tim Chen <tim.c.chen@...ux.intel.com> --- arch/x86/kernel/cpu/bugs.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index c37e66e..5ac7070 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -283,22 +283,21 @@ static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline(void) if (cmdline_find_option_bool(boot_command_line, "nospectre_v2")) return SPECTRE_V2_CMD_NONE; - else { - ret = cmdline_find_option(boot_command_line, "spectre_v2", arg, sizeof(arg)); - if (ret < 0) - return SPECTRE_V2_CMD_AUTO; - for (i = 0; i < ARRAY_SIZE(mitigation_options); i++) { - if (!match_option(arg, ret, mitigation_options[i].option)) - continue; - cmd = mitigation_options[i].cmd; - break; - } + ret = cmdline_find_option(boot_command_line, "spectre_v2", arg, sizeof(arg)); + if (ret < 0) + return SPECTRE_V2_CMD_AUTO; - if (i >= ARRAY_SIZE(mitigation_options)) { - pr_err("unknown option (%s). Switching to AUTO select\n", arg); - return SPECTRE_V2_CMD_AUTO; - } + for (i = 0; i < ARRAY_SIZE(mitigation_options); i++) { + if (!match_option(arg, ret, mitigation_options[i].option)) + continue; + cmd = mitigation_options[i].cmd; + break; + } + + if (i >= ARRAY_SIZE(mitigation_options)) { + pr_err("unknown option (%s). Switching to AUTO select\n", arg); + return SPECTRE_V2_CMD_AUTO; } if ((cmd == SPECTRE_V2_CMD_RETPOLINE || -- 2.9.4
Powered by blists - more mailing lists