Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30a8e214 authored by Tim Chen's avatar Tim Chen Committed by Greg Kroah-Hartman
Browse files

x86/speculation: Remove unnecessary ret variable in cpu_show_common() 



commit b86bda0426853bfe8a3506c7d2a5b332760ae46b upstream

Signed-off-by: default avatarTim Chen <tim.c.chen@linux.intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Casey Schaufler <casey.schaufler@intel.com>
Cc: Asit Mallick <asit.k.mallick@intel.com>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Jon Masters <jcm@redhat.com>
Cc: Waiman Long <longman9394@gmail.com>
Cc: Greg KH <gregkh@linuxfoundation.org>
Cc: Dave Stewart <david.c.stewart@intel.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20181125185003.783903657@linutronix.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2ee44e2d

arch/x86/kernel/cpu/bugs.c

+1 −4
Original line number Diff line number Diff line
@@ -845,8 +845,6 @@ static ssize_t l1tf_show_state(char *buf) 
static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr,

			       char *buf, unsigned int bug)

{

	int ret;



	if (!boot_cpu_has_bug(bug))

		return sprintf(buf, "Not affected\n");
@@ -864,13 +862,12 @@ static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr 
		return sprintf(buf, "Mitigation: __user pointer sanitization\n");



	case X86_BUG_SPECTRE_V2:

		ret = sprintf(buf, "%s%s%s%s%s%s\n", spectre_v2_strings[spectre_v2_enabled],

		return sprintf(buf, "%s%s%s%s%s%s\n", spectre_v2_strings[spectre_v2_enabled],

			       boot_cpu_has(X86_FEATURE_USE_IBPB) ? ", IBPB" : "",

			       boot_cpu_has(X86_FEATURE_USE_IBRS_FW) ? ", IBRS_FW" : "",

			       (x86_spec_ctrl_base & SPEC_CTRL_STIBP) ? ", STIBP" : "",

			       boot_cpu_has(X86_FEATURE_RSB_CTXSW) ? ", RSB filling" : "",

			       spectre_v2_module_string());

		return ret;



	case X86_BUG_SPEC_STORE_BYPASS:

		return sprintf(buf, "%s\n", ssb_strings[ssb_mode]);