diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-19 18:27:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-19 18:27:58 -0800 |
| commit | fe112793600bb14cfd519ed148ca2f252d7b14bc (patch) | |
| tree | d52242575c5e7f156251381d9df517e5f955dd94 /arch/x86/include/asm/msr-index.h | |
| parent | Merge tag 'dma-mapping-4.20-4' of git://git.infradead.org/users/hch/dma-mapping (diff) | |
| parent | kvm: x86: Add AMD's EX_CFG to the list of ignored MSRs (diff) | |
| download | linux-dev-fe112793600bb14cfd519ed148ca2f252d7b14bc.tar.xz linux-dev-fe112793600bb14cfd519ed148ca2f252d7b14bc.zip | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull kvm fixes from Paolo Bonzini:
- One nasty use-after-free bugfix, from this merge window however
- A less nasty use-after-free that can only zero some words at the
beginning of the page, and hence is not really exploitable
- A NULL pointer dereference
- A dummy implementation of an AMD chicken bit MSR that Windows uses
for some unknown reason
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
kvm: x86: Add AMD's EX_CFG to the list of ignored MSRs
KVM: X86: Fix NULL deref in vcpu_scan_ioapic
KVM: Fix UAF in nested posted interrupt processing
KVM: fix unregistering coalesced mmio zone from wrong bus
Diffstat (limited to 'arch/x86/include/asm/msr-index.h')
| -rw-r--r-- | arch/x86/include/asm/msr-index.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index c8f73efb4ece..9e39cc8bd989 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -390,6 +390,7 @@ #define MSR_F15H_NB_PERF_CTR 0xc0010241 #define MSR_F15H_PTSC 0xc0010280 #define MSR_F15H_IC_CFG 0xc0011021 +#define MSR_F15H_EX_CFG 0xc001102c /* Fam 10h MSRs */ #define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 |