x86, microcode: Ensure that module is only loaded on supported AMD CPUs
Exit early when there's no support for a particular CPU family. Also, fixup the "no support for this CPU vendor" to be issued only when the driver is attempted to be loaded on an unsupported vendor. Cc: stable@vger.kernel.org Cc: Tigran Aivazian <tigran@aivazian.fsnet.co.uk> Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Link: http://lkml.kernel.org/r/20120411163849.GE4794@alberich.amd.com [Boris: add a commit msg because Andreas is lazy] Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
This commit is contained in:
parent
a956bd6f85
commit
283c1f2558
|
@ -82,11 +82,6 @@ static int collect_cpu_info_amd(int cpu, struct cpu_signature *csig)
|
||||||
{
|
{
|
||||||
struct cpuinfo_x86 *c = &cpu_data(cpu);
|
struct cpuinfo_x86 *c = &cpu_data(cpu);
|
||||||
|
|
||||||
if (c->x86_vendor != X86_VENDOR_AMD || c->x86 < 0x10) {
|
|
||||||
pr_warning("CPU%d: family %d not supported\n", cpu, c->x86);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
csig->rev = c->microcode;
|
csig->rev = c->microcode;
|
||||||
pr_info("CPU%d: patch_level=0x%08x\n", cpu, csig->rev);
|
pr_info("CPU%d: patch_level=0x%08x\n", cpu, csig->rev);
|
||||||
|
|
||||||
|
@ -380,6 +375,13 @@ static struct microcode_ops microcode_amd_ops = {
|
||||||
|
|
||||||
struct microcode_ops * __init init_amd_microcode(void)
|
struct microcode_ops * __init init_amd_microcode(void)
|
||||||
{
|
{
|
||||||
|
struct cpuinfo_x86 *c = &cpu_data(0);
|
||||||
|
|
||||||
|
if (c->x86_vendor != X86_VENDOR_AMD || c->x86 < 0x10) {
|
||||||
|
pr_warning("AMD CPU family 0x%x not supported\n", c->x86);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
patch = (void *)get_zeroed_page(GFP_KERNEL);
|
patch = (void *)get_zeroed_page(GFP_KERNEL);
|
||||||
if (!patch)
|
if (!patch)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -526,11 +526,11 @@ static int __init microcode_init(void)
|
||||||
microcode_ops = init_intel_microcode();
|
microcode_ops = init_intel_microcode();
|
||||||
else if (c->x86_vendor == X86_VENDOR_AMD)
|
else if (c->x86_vendor == X86_VENDOR_AMD)
|
||||||
microcode_ops = init_amd_microcode();
|
microcode_ops = init_amd_microcode();
|
||||||
|
else
|
||||||
if (!microcode_ops) {
|
|
||||||
pr_err("no support for this CPU vendor\n");
|
pr_err("no support for this CPU vendor\n");
|
||||||
|
|
||||||
|
if (!microcode_ops)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
|
||||||
|
|
||||||
microcode_pdev = platform_device_register_simple("microcode", -1,
|
microcode_pdev = platform_device_register_simple("microcode", -1,
|
||||||
NULL, 0);
|
NULL, 0);
|
||||||
|
|
Reference in New Issue