lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 7 Mar 2014 17:07:41 -0800 From: Greg Kroah-Hartman <gregkh@...uxfoundation.org> To: linux-kernel@...r.kernel.org Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>, stable@...r.kernel.org, Dominik Dingel <dingel@...ux.vnet.ibm.com>, Christian Borntraeger <borntraeger@...ibm.com>, Paolo Bonzini <pbonzini@...hat.com>, Qiang Huang <h.huangqiang@...wei.com> Subject: [PATCH 3.4 45/99] KVM: s390: move kvm_guest_enter,exit closer to sie 3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dominik Dingel <dingel@...ux.vnet.ibm.com> commit 2b29a9fdcb92bfc6b6f4c412d71505869de61a56 upstream. Any uaccess between guest_enter and guest_exit could trigger a page fault, the page fault handler would handle it as a guest fault and translate a user address as guest address. Signed-off-by: Dominik Dingel <dingel@...ux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@...ibm.com> CC: stable@...r.kernel.org Signed-off-by: Paolo Bonzini <pbonzini@...hat.com> [hq: Backported to 3.4: adjust context] Signed-off-by: Qiang Huang <h.huangqiang@...wei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org> --- arch/s390/kvm/kvm-s390.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -525,13 +525,18 @@ static int __vcpu_run(struct kvm_vcpu *v if (!kvm_is_ucontrol(vcpu->kvm)) kvm_s390_deliver_pending_interrupts(vcpu); + VCPU_EVENT(vcpu, 6, "entering sie flags %x", + atomic_read(&vcpu->arch.sie_block->cpuflags)); + vcpu->arch.sie_block->icptcode = 0; local_irq_disable(); kvm_guest_enter(); local_irq_enable(); - VCPU_EVENT(vcpu, 6, "entering sie flags %x", - atomic_read(&vcpu->arch.sie_block->cpuflags)); rc = sie64a(vcpu->arch.sie_block, vcpu->run->s.regs.gprs); + local_irq_disable(); + kvm_guest_exit(); + local_irq_enable(); + if (rc) { if (kvm_is_ucontrol(vcpu->kvm)) { rc = SIE_INTERCEPT_UCONTROL; @@ -543,9 +548,6 @@ static int __vcpu_run(struct kvm_vcpu *v } VCPU_EVENT(vcpu, 6, "exit sie icptcode %d", vcpu->arch.sie_block->icptcode); - local_irq_disable(); - kvm_guest_exit(); - local_irq_enable(); memcpy(&vcpu->run->s.regs.gprs[14], &vcpu->arch.sie_block->gg14, 16); return rc; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists