Commit da63865a authored by Boris Ostrovsky's avatar Boris Ostrovsky Committed by Borislav Petkov

x86, microcode: Return error from driver init code when loader is disabled

Commits 65cef131 ("x86, microcode: Add a disable chicken bit") and
a18a0f68 ("x86, microcode: Don't initialize microcode code on
paravirt") allow microcode driver skip initialization when microcode
loading is not permitted.

However, they don't prevent the driver from being loaded since the
init code returns 0. If at some point later the driver gets unloaded
this will result in an oops while trying to deregister the (never
registered) device.

To avoid this, make init code return an error on paravirt or when
microcode loading is disabled. The driver will then never be loaded.
Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Link: http://lkml.kernel.org/r/1422411669-25147-1-git-send-email-boris.ostrovsky@oracle.comReported-by: default avatarJames Digwall <james@dingwall.me.uk>
Cc: stable@vger.kernel.org # 3.18
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent 26bc420b
...@@ -552,7 +552,7 @@ static int __init microcode_init(void) ...@@ -552,7 +552,7 @@ static int __init microcode_init(void)
int error; int error;
if (paravirt_enabled() || dis_ucode_ldr) if (paravirt_enabled() || dis_ucode_ldr)
return 0; return -EINVAL;
if (c->x86_vendor == X86_VENDOR_INTEL) if (c->x86_vendor == X86_VENDOR_INTEL)
microcode_ops = init_intel_microcode(); microcode_ops = init_intel_microcode();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment