diff options
| author | Linus Torvalds | 2014-04-15 01:21:28 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-04-15 01:21:28 +0200 |
| commit | 55101e2d6ce1c780f6ee8fee5f37306971aac6cd (patch) | |
| tree | 348adcfd97517ee9b5041f31df15cdd7fedb8ea7 /fs/locks.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| parent | KVM: x86: remove WARN_ON from get_kernel_ns() (diff) | |
| download | kernel-qcow2-linux-55101e2d6ce1c780f6ee8fee5f37306971aac6cd.tar.gz kernel-qcow2-linux-55101e2d6ce1c780f6ee8fee5f37306971aac6cd.tar.xz kernel-qcow2-linux-55101e2d6ce1c780f6ee8fee5f37306971aac6cd.zip | |
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Marcelo Tosatti:
- Fix for guest triggerable BUG_ON (CVE-2014-0155)
- CR4.SMAP support
- Spurious WARN_ON() fix
* git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: x86: remove WARN_ON from get_kernel_ns()
KVM: Rename variable smep to cr4_smep
KVM: expose SMAP feature to guest
KVM: Disable SMAP for guests in EPT realmode and EPT unpaging mode
KVM: Add SMAP support when setting CR4
KVM: Remove SMAP bit from CR4_RESERVED_BITS
KVM: ioapic: try to recover if pending_eoi goes out of range
KVM: ioapic: fix assignment of ioapic->rtc_status.pending_eoi (CVE-2014-0155)
Diffstat (limited to 'fs/locks.c')
0 files changed, 0 insertions, 0 deletions