[kernel] r22257 - dists/wheezy-security/linux/debian/patches/bugfix/x86

[Ben Hutchings]

Author: benh
Date: Mon Jan 12 18:36:31 2015
New Revision: 22257

Log:
Change CVE-2013-6885 fix to use {rd,wr}msrl_amd_safe() as the generic {rd,wr}msrl_safe() are not defined

Modified:
   dists/wheezy-security/linux/debian/patches/bugfix/x86/x86-cpu-amd-add-workaround-for-family-16h-erratum-79.patch

Modified: dists/wheezy-security/linux/debian/patches/bugfix/x86/x86-cpu-amd-add-workaround-for-family-16h-erratum-79.patch
==============================================================================
--- dists/wheezy-security/linux/debian/patches/bugfix/x86/x86-cpu-amd-add-workaround-for-family-16h-erratum-79.patch	Mon Jan 12 14:34:44 2015	(r22256)
+++ dists/wheezy-security/linux/debian/patches/bugfix/x86/x86-cpu-amd-add-workaround-for-family-16h-erratum-79.patch	Mon Jan 12 18:36:31 2015	(r22257)
@@ -45,7 +45,7 @@
  - Venkatesh Srinivas pointed out we should use {rd,wr}msrl_safe() to
    avoid crashing on KVM.  This was fixed upstream by commit 8f86a7373a1c
    ("x86, AMD: Convert to the new bit access MSR accessors") but that's too
-   much trouble to backport.]
+   much trouble to backport.  Here we must use {rd,wr}msrl_amd_safe().]
 ---
  arch/x86/include/asm/msr-index.h |  1 +
  arch/x86/kernel/cpu/amd.c             | 10 ++++++++++
@@ -72,9 +72,9 @@
 +	if (c->x86 == 0x16 && c->x86_model <= 0xf) {
 +		u64 val;
 +
-+		if (!rdmsrl_safe(MSR_AMD64_LS_CFG, &val) &&
++		if (!rdmsrl_amd_safe(MSR_AMD64_LS_CFG, &val) &&
 +		    !(val & BIT(15)))
-+			wrmsrl_safe(MSR_AMD64_LS_CFG, val | BIT(15));
++			wrmsrl_amd_safe(MSR_AMD64_LS_CFG, val | BIT(15));
 +	}
 +
  }