[kernel/f15] Fix oops on invalid AMD microcode load (rhbz 797559)
Josh Boyer
jwboyer at fedoraproject.org
Tue Apr 17 15:11:00 UTC 2012
commit 210099fb2c34b46bfda653480aea01f7e5565dc8
Author: Josh Boyer <jwboyer at redhat.com>
Date: Tue Apr 17 11:05:33 2012 -0400
Fix oops on invalid AMD microcode load (rhbz 797559)
kernel.spec | 10 ++
...ule-is-only-loaded-for-supported-AMD-CPUs.patch | 163 +++++++++++++++++++
...-during-module-unload-on-unsupported-CPUs.patch | 167 ++++++++++++++++++++
3 files changed, 340 insertions(+), 0 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 92bd050..57a731a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -704,6 +704,9 @@ Patch21520: KVM-Ensure-all-vcpus-are-consistent-with-in-kernel-i.patch
#rhbz 808559
Patch21530: ALSA-hda-realtek-Add-quirk-for-Mac-Pro-5-1-machines.patch
+Patch21700: x86-microcode-Fix-sysfs-warning-during-module-unload-on-unsupported-CPUs.patch
+Patch21701: x86-microcode-Ensure-that-module-is-only-loaded-for-supported-AMD-CPUs.patch
+
Patch22000: weird-root-dentry-name-debug.patch
%endif
@@ -1302,6 +1305,10 @@ ApplyPatch libata-disable-runtime-pm-for-hotpluggable-port.patch
ApplyPatch x86-Use-correct-byte-sized-register-constraint-in-__xchg_op.patch
ApplyPatch x86-Use-correct-byte-sized-register-constraint-in-__add.patch
+#rhbz 797559
+ApplyPatch x86-microcode-Fix-sysfs-warning-during-module-unload-on-unsupported-CPUs.patch
+ApplyPatch x86-microcode-Ensure-that-module-is-only-loaded-for-supported-AMD-CPUs.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -1954,6 +1961,9 @@ fi
# and build.
%changelog
+* Tue Apr 17 2012 Josh Boyer <jwboyer at redhat.com>
+- Fix oops on invalid AMD microcode load (rhbz 797559)
+
* Sat Apr 14 2012 Josh Boyer <jwboyer at redhat.com>
- Add ALSA quirk for MacPro 5,1 machines (rhbz 808559)
diff --git a/x86-microcode-Ensure-that-module-is-only-loaded-for-supported-AMD-CPUs.patch b/x86-microcode-Ensure-that-module-is-only-loaded-for-supported-AMD-CPUs.patch
new file mode 100644
index 0000000..d693173
--- /dev/null
+++ b/x86-microcode-Ensure-that-module-is-only-loaded-for-supported-AMD-CPUs.patch
@@ -0,0 +1,163 @@
+Path: news.gmane.org!not-for-mail
+From: Borislav Petkov <borislav.petkov at amd.com>
+Newsgroups: gmane.linux.kernel
+Subject: [PATCH 2/2] x86, microcode: Ensure that module is only loaded for
+Date: Thu, 12 Apr 2012 18:34:22 +0200
+Lines: 80
+Approved: news at gmane.org
+Message-ID: <20120412163422.GM24549 at aftab>
+References: <20120411163849.GE4794 at alberich.amd.com>
+ <20120411200601.GC12288 at kroah.com>
+ <20120411201053.GF18114 at aftab>
+ <20120412162351.GJ24549 at aftab>
+NNTP-Posting-Host: plane.gmane.org
+Mime-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+X-Trace: dough.gmane.org 1334248500 15307 80.91.229.3 (12 Apr 2012 16:35:00 GMT)
+X-Complaints-To: usenet at dough.gmane.org
+NNTP-Posting-Date: Thu, 12 Apr 2012 16:35:00 +0000 (UTC)
+Cc: Andreas Herrmann <andreas.herrmann3 at amd.com>,
+ Kay Sievers <kay.sievers at vrfy.org>,
+ Dave Jones <davej at redhat.com>, <linux-kernel at vger.kernel.org>
+To: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+Original-X-From: linux-kernel-owner at vger.kernel.org Thu Apr 12 18:34:59 2012
+Return-path: <linux-kernel-owner at vger.kernel.org>
+Envelope-to: glk-linux-kernel-3 at plane.gmane.org
+Original-Received: from vger.kernel.org ([209.132.180.67])
+ by plane.gmane.org with esmtp (Exim 4.69)
+ (envelope-from <linux-kernel-owner at vger.kernel.org>)
+ id 1SIMz4-0008MV-3g
+ for glk-linux-kernel-3 at plane.gmane.org; Thu, 12 Apr 2012 18:34:58 +0200
+Original-Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
+ id S965760Ab2DLQep (ORCPT <rfc822;glk-linux-kernel-3 at m.gmane.org>);
+ Thu, 12 Apr 2012 12:34:45 -0400
+Original-Received: from db3ehsobe002.messaging.microsoft.com ([213.199.154.140]:56919
+ "EHLO db3outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK)
+ by vger.kernel.org with ESMTP id S965553Ab2DLQen (ORCPT
+ <rfc822;linux-kernel at vger.kernel.org>);
+ Thu, 12 Apr 2012 12:34:43 -0400
+Original-Received: from mail2-db3-R.bigfish.com (10.3.81.239) by
+ DB3EHSOBE005.bigfish.com (10.3.84.25) with Microsoft SMTP Server id
+ 14.1.225.23; Thu, 12 Apr 2012 16:34:41 +0000
+Original-Received: from mail2-db3 (localhost [127.0.0.1]) by mail2-db3-R.bigfish.com
+ (Postfix) with ESMTP id E4EF14404B4; Thu, 12 Apr 2012 16:34:41 +0000 (UTC)
+X-SpamScore: 0
+X-BigFish: VPS0(zzzz1202hzz8275bh8275dhz2dh668h839h944hd25hd2bh)
+X-Forefront-Antispam-Report: CIP:163.181.249.108;KIP:(null);UIP:(null);IPV:NLI;H:ausb3twp01.amd.com;RD:none;EFVD:NLI
+Original-Received: from mail2-db3 (localhost.localdomain [127.0.0.1]) by mail2-db3
+ (MessageSwitch) id 1334248479906480_3860; Thu, 12 Apr 2012 16:34:39 +0000
+ (UTC)
+Original-Received: from DB3EHSMHS005.bigfish.com (unknown [10.3.81.241]) by
+ mail2-db3.bigfish.com (Postfix) with ESMTP id CEB76400A4; Thu, 12 Apr 2012
+ 16:34:39 +0000 (UTC)
+Original-Received: from ausb3twp01.amd.com (163.181.249.108) by
+ DB3EHSMHS005.bigfish.com (10.3.87.105) with Microsoft SMTP Server id
+ 14.1.225.23; Thu, 12 Apr 2012 16:34:38 +0000
+X-WSS-ID: 0M2DKPO-01-CNU-02
+X-M-MSG:
+Original-Received: from sausexedgep02.amd.com (sausexedgep02-ext.amd.com
+ [163.181.249.73]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No
+ client certificate requested) by ausb3twp01.amd.com (Axway MailGate 3.8.1)
+ with ESMTP id 2C1D81028100; Thu, 12 Apr 2012 11:34:36 -0500 (CDT)
+Original-Received: from SAUSEXDAG02.amd.com (163.181.55.2) by sausexedgep02.amd.com
+ (163.181.36.59) with Microsoft SMTP Server (TLS) id 8.3.192.1; Thu, 12 Apr
+ 2012 11:34:51 -0500
+Original-Received: from storexhtp01.amd.com (172.24.4.3) by sausexdag02.amd.com
+ (163.181.55.2) with Microsoft SMTP Server (TLS) id 14.1.323.3; Thu, 12 Apr
+ 2012 11:34:36 -0500
+Original-Received: from gwo.osrc.amd.com (165.204.16.204) by storexhtp01.amd.com
+ (172.24.4.3) with Microsoft SMTP Server id 8.3.213.0; Thu, 12 Apr 2012
+ 12:34:35 -0400
+Original-Received: from aftab (aftab.osrc.amd.com [165.204.15.109]) by gwo.osrc.amd.com
+ (Postfix) with ESMTP id D8E4C49C58B; Thu, 12 Apr 2012 17:34:33 +0100 (BST)
+Content-Disposition: inline
+In-Reply-To: <20120412162351.GJ24549 at aftab>
+User-Agent: Mutt/1.5.21 (2010-09-15)
+X-OriginatorOrg: amd.com
+Original-Sender: linux-kernel-owner at vger.kernel.org
+Precedence: bulk
+List-ID: <linux-kernel.vger.kernel.org>
+X-Mailing-List: linux-kernel at vger.kernel.org
+Xref: news.gmane.org gmane.linux.kernel:1281050
+Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1281050>
+
+From: Andreas Herrmann <andreas.herrmann3 at amd.com>
+Date: Thu, 12 Apr 2012 16:51:57 +0200
+Subject: [PATCH 2/2] x86, microcode: Ensure that module is only loaded for 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 at vger.kernel.org
+Cc: Tigran Aivazian <tigran at aivazian.fsnet.co.uk>
+Cc: Borislav Petkov <borislav.petkov at amd.com>
+[Boris: added a commit msg because Andreas is lazy]
+Signed-off-by: Andreas Herrmann <andreas.herrmann3 at amd.com>
+---
+ arch/x86/kernel/microcode_amd.c | 12 +++++++-----
+ arch/x86/kernel/microcode_core.c | 6 +++---
+ 2 files changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
+index 73465aa..8a2ce8f 100644
+--- a/arch/x86/kernel/microcode_amd.c
++++ b/arch/x86/kernel/microcode_amd.c
+@@ -82,11 +82,6 @@ static int collect_cpu_info_amd(int cpu, struct cpu_signature *csig)
+ {
+ 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;
+ 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 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);
+ if (!patch)
+ return NULL;
+diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
+index d389e74..c9bda6d 100644
+--- a/arch/x86/kernel/microcode_core.c
++++ b/arch/x86/kernel/microcode_core.c
+@@ -526,11 +526,11 @@ static int __init microcode_init(void)
+ microcode_ops = init_intel_microcode();
+ else if (c->x86_vendor == X86_VENDOR_AMD)
+ microcode_ops = init_amd_microcode();
+-
+- if (!microcode_ops) {
++ else
+ pr_err("no support for this CPU vendor\n");
++
++ if (!microcode_ops)
+ return -ENODEV;
+- }
+
+ microcode_pdev = platform_device_register_simple("microcode", -1,
+ NULL, 0);
+--
+1.7.8.4
+
+--
+Regards/Gruss,
+Boris.
+
+Advanced Micro Devices GmbH
+Einsteinring 24, 85609 Dornach
+GM: Alberto Bozzo
+Reg: Dornach, Landkreis Muenchen
+HRB Nr. 43632 WEEE Registernr: 129 19551
+
diff --git a/x86-microcode-Fix-sysfs-warning-during-module-unload-on-unsupported-CPUs.patch b/x86-microcode-Fix-sysfs-warning-during-module-unload-on-unsupported-CPUs.patch
new file mode 100644
index 0000000..d1cafc1
--- /dev/null
+++ b/x86-microcode-Fix-sysfs-warning-during-module-unload-on-unsupported-CPUs.patch
@@ -0,0 +1,167 @@
+Path: news.gmane.org!not-for-mail
+From: Borislav Petkov <borislav.petkov at amd.com>
+Newsgroups: gmane.linux.kernel
+Subject: [PATCH 1/2] x86, microcode: Fix sysfs warning during module unload
+Date: Thu, 12 Apr 2012 18:30:38 +0200
+Lines: 83
+Approved: news at gmane.org
+Message-ID: <20120412163038.GL24549 at aftab>
+References: <20120411163849.GE4794 at alberich.amd.com>
+ <20120411200601.GC12288 at kroah.com>
+ <20120411201053.GF18114 at aftab>
+ <20120412162351.GJ24549 at aftab>
+NNTP-Posting-Host: plane.gmane.org
+Mime-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+X-Trace: dough.gmane.org 1334248312 13759 80.91.229.3 (12 Apr 2012 16:31:52 GMT)
+X-Complaints-To: usenet at dough.gmane.org
+NNTP-Posting-Date: Thu, 12 Apr 2012 16:31:52 +0000 (UTC)
+Cc: Andreas Herrmann <andreas.herrmann3 at amd.com>,
+ Kay Sievers <kay.sievers at vrfy.org>,
+ Dave Jones <davej at redhat.com>, <linux-kernel at vger.kernel.org>
+To: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+Original-X-From: linux-kernel-owner at vger.kernel.org Thu Apr 12 18:31:50 2012
+Return-path: <linux-kernel-owner at vger.kernel.org>
+Envelope-to: glk-linux-kernel-3 at plane.gmane.org
+Original-Received: from vger.kernel.org ([209.132.180.67])
+ by plane.gmane.org with esmtp (Exim 4.69)
+ (envelope-from <linux-kernel-owner at vger.kernel.org>)
+ id 1SIMw1-0005nm-KE
+ for glk-linux-kernel-3 at plane.gmane.org; Thu, 12 Apr 2012 18:31:49 +0200
+Original-Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
+ id S934534Ab2DLQbF (ORCPT <rfc822;glk-linux-kernel-3 at m.gmane.org>);
+ Thu, 12 Apr 2012 12:31:05 -0400
+Original-Received: from db3ehsobe004.messaging.microsoft.com ([213.199.154.142]:35401
+ "EHLO db3outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK)
+ by vger.kernel.org with ESMTP id S934436Ab2DLQbD (ORCPT
+ <rfc822;linux-kernel at vger.kernel.org>);
+ Thu, 12 Apr 2012 12:31:03 -0400
+Original-Received: from mail117-db3-R.bigfish.com (10.3.81.240) by
+ DB3EHSOBE002.bigfish.com (10.3.84.22) with Microsoft SMTP Server id
+ 14.1.225.23; Thu, 12 Apr 2012 16:31:00 +0000
+Original-Received: from mail117-db3 (localhost [127.0.0.1]) by
+ mail117-db3-R.bigfish.com (Postfix) with ESMTP id BAA93180481; Thu, 12 Apr
+ 2012 16:31:00 +0000 (UTC)
+X-SpamScore: 1
+X-BigFish: VPS1(zzzz1202hzz8275eh8275bh8275dha1495iz2dh668h839h944hd25hd2bh)
+X-Forefront-Antispam-Report: CIP:163.181.249.109;KIP:(null);UIP:(null);IPV:NLI;H:ausb3twp02.amd.com;RD:none;EFVD:NLI
+Original-Received: from mail117-db3 (localhost.localdomain [127.0.0.1]) by mail117-db3
+ (MessageSwitch) id 133424825930391_28243; Thu, 12 Apr 2012 16:30:59 +0000
+ (UTC)
+Original-Received: from DB3EHSMHS006.bigfish.com (unknown [10.3.81.226]) by
+ mail117-db3.bigfish.com (Postfix) with ESMTP id ED7022E004F; Thu, 12 Apr 2012
+ 16:30:58 +0000 (UTC)
+Original-Received: from ausb3twp02.amd.com (163.181.249.109) by
+ DB3EHSMHS006.bigfish.com (10.3.87.106) with Microsoft SMTP Server id
+ 14.1.225.23; Thu, 12 Apr 2012 16:30:57 +0000
+X-WSS-ID: 0M2DKJG-02-0NU-02
+X-M-MSG:
+Original-Received: from sausexedgep01.amd.com (sausexedgep01-ext.amd.com
+ [163.181.249.72]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No
+ client certificate requested) by ausb3twp02.amd.com (Axway MailGate 3.8.1)
+ with ESMTP id 21D3FC814C; Thu, 12 Apr 2012 11:30:50 -0500 (CDT)
+Original-Received: from SAUSEXDAG01.amd.com (163.181.55.1) by sausexedgep01.amd.com
+ (163.181.36.54) with Microsoft SMTP Server (TLS) id 8.3.192.1; Thu, 12 Apr
+ 2012 11:31:09 -0500
+Original-Received: from storexhtp02.amd.com (172.24.4.4) by sausexdag01.amd.com
+ (163.181.55.1) with Microsoft SMTP Server (TLS) id 14.1.323.3; Thu, 12 Apr
+ 2012 11:30:54 -0500
+Original-Received: from gwo.osrc.amd.com (165.204.16.204) by storexhtp02.amd.com
+ (172.24.4.4) with Microsoft SMTP Server id 8.3.213.0; Thu, 12 Apr 2012
+ 12:30:51 -0400
+Original-Received: from aftab (aftab.osrc.amd.com [165.204.15.109]) by gwo.osrc.amd.com
+ (Postfix) with ESMTP id 0D00D49C58B; Thu, 12 Apr 2012 17:30:50 +0100 (BST)
+Content-Disposition: inline
+In-Reply-To: <20120412162351.GJ24549 at aftab>
+User-Agent: Mutt/1.5.21 (2010-09-15)
+X-OriginatorOrg: amd.com
+Original-Sender: linux-kernel-owner at vger.kernel.org
+Precedence: bulk
+List-ID: <linux-kernel.vger.kernel.org>
+X-Mailing-List: linux-kernel at vger.kernel.org
+Xref: news.gmane.org gmane.linux.kernel:1281049
+Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1281049>
+
+From: Andreas Herrmann <andreas.herrmann3 at amd.com>
+Date: Thu, 12 Apr 2012 16:48:01 +0200
+Subject: [PATCH 1/2] x86, microcode: Fix sysfs warning during module unload on unsupported CPUs
+
+Loading microcode driver on an unsupported CPU and subsequently
+unloading the driver causes
+
+ WARNING: at fs/sysfs/group.c:138 mc_device_remove+0x5f/0x70 [microcode]()
+ Hardware name: 01972NG
+ sysfs group ffffffffa00013d0 not found for kobject 'cpu0'
+ Modules linked in: snd_hda_codec_hdmi snd_hda_codec_conexant snd_hda_intel btusb snd_hda_codec bluetooth thinkpad_acpi rfkill microcode(-) [last unloaded: cfg80211]
+ Pid: 4560, comm: modprobe Not tainted 3.4.0-rc2-00002-g258f742 #5
+ Call Trace:
+ [<ffffffff8103113b>] ? warn_slowpath_common+0x7b/0xc0
+ [<ffffffff81031235>] ? warn_slowpath_fmt+0x45/0x50
+ [<ffffffff81120e74>] ? sysfs_remove_group+0x34/0x120
+ [<ffffffffa00000ef>] ? mc_device_remove+0x5f/0x70 [microcode]
+ [<ffffffff81331eb9>] ? subsys_interface_unregister+0x69/0xa0
+ [<ffffffff81563526>] ? mutex_lock+0x16/0x40
+ [<ffffffffa0000c3e>] ? microcode_exit+0x50/0x92 [microcode]
+ [<ffffffff8107051d>] ? sys_delete_module+0x16d/0x260
+ [<ffffffff810a0065>] ? wait_iff_congested+0x45/0x110
+ [<ffffffff815656af>] ? page_fault+0x1f/0x30
+ [<ffffffff81565ba2>] ? system_call_fastpath+0x16/0x1b
+
+on recent kernels.
+
+This is due to
+
+ commit 8a25a2fd126c621f44f3aeaef80d51f00fc11639
+ (cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular
+ subsystem)
+
+which renders
+
+ commit 6c53cbfced048c421e4f72cb2183465f68fbc5e7
+ (x86, microcode: Correct sysdev_add error path)
+
+useless.
+
+See http://marc.info/?l=linux-kernel&m=133416246406478
+
+Avoid above warning by restoring the old driver behaviour before
+commit 6c53cbfced048c421e4f72cb2183465f68fbc5e7 (x86, microcode:
+Correct sysdev_add error path)
+
+Cc: stable at vger.kernel.org
+Cc: Tigran Aivazian <tigran at aivazian.fsnet.co.uk>
+Cc: Borislav Petkov <borislav.petkov at amd.com>
+Signed-off-by: Andreas Herrmann <andreas.herrmann3 at amd.com>
+---
+ arch/x86/kernel/microcode_core.c | 4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
+index 87a0f86..d389e74 100644
+--- a/arch/x86/kernel/microcode_core.c
++++ b/arch/x86/kernel/microcode_core.c
+@@ -419,10 +419,8 @@ static int mc_device_add(struct device *dev, struct subsys_interface *sif)
+ if (err)
+ return err;
+
+- if (microcode_init_cpu(cpu) == UCODE_ERROR) {
+- sysfs_remove_group(&dev->kobj, &mc_attr_group);
++ if (microcode_init_cpu(cpu) == UCODE_ERROR)
+ return -EINVAL;
+- }
+
+ return err;
+ }
+--
+1.7.8.4
+
+--
+Regards/Gruss,
+Boris.
+
+Advanced Micro Devices GmbH
+Einsteinring 24, 85609 Dornach
+GM: Alberto Bozzo
+Reg: Dornach, Landkreis Muenchen
+HRB Nr. 43632 WEEE Registernr: 129 19551
+
More information about the scm-commits
mailing list