diff options
| author | Borislav Petkov <bp@suse.de> | 2019-04-04 22:14:07 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-31 06:47:28 -0700 |
| commit | f089f7441ee4e7bb28f901bb3895ef415940fd58 (patch) | |
| tree | 36ebcf326fe08d8c02ad5b18060c56ec348e3030 /arch/x86/kernel | |
| parent | 3c9193ada1b29756d905a28d10bedff8282e5d62 (diff) | |
| download | linux-stable-f089f7441ee4e7bb28f901bb3895ef415940fd58.tar.gz linux-stable-f089f7441ee4e7bb28f901bb3895ef415940fd58.tar.bz2 linux-stable-f089f7441ee4e7bb28f901bb3895ef415940fd58.zip | |
x86/microcode: Fix the ancient deprecated microcode loading method
[ Upstream commit 24613a04ad1c0588c10f4b5403ca60a73d164051 ]
Commit
2613f36ed965 ("x86/microcode: Attempt late loading only when new microcode is present")
added the new define UCODE_NEW to denote that an update should happen
only when newer microcode (than installed on the system) has been found.
But it missed adjusting that for the old /dev/cpu/microcode loading
interface. Fix it.
Fixes: 2613f36ed965 ("x86/microcode: Attempt late loading only when new microcode is present")
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jann Horn <jannh@google.com>
Link: https://lkml.kernel.org/r/20190405133010.24249-3-bp@alien8.de
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index 387a8f44fba1..b6b44017cf16 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -418,8 +418,9 @@ static int do_microcode_update(const void __user *buf, size_t size) if (ustate == UCODE_ERROR) { error = -1; break; - } else if (ustate == UCODE_OK) + } else if (ustate == UCODE_NEW) { apply_microcode_on_target(cpu); + } } return error; |