From af70a0448ddfe4434bb54911a79a7274a5e162b4 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Mon, 8 Jan 2018 21:43:26 +0530 Subject: [PATCH 06/26] UBUNTU: SAUCE: rfi-flush: Fix some RFI conversions in the KVM code CVE-2017-5754 Spotted by Paul. Signed-off-by: Michael Ellerman Signed-off-by: Stefan Bader --- arch/powerpc/kvm/book3s_rmhandlers.S | 2 +- arch/powerpc/kvm/book3s_segment.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kvm/book3s_rmhandlers.S b/arch/powerpc/kvm/book3s_rmhandlers.S index 8e2b42fb..67b8e83 100644 --- a/arch/powerpc/kvm/book3s_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_rmhandlers.S @@ -140,7 +140,7 @@ kvmppc_handler_skip_ins: GET_SCRATCH0(r13) /* And get back into the code */ - RFI_TO_GUEST + RFI_TO_KERNEL #endif /* diff --git a/arch/powerpc/kvm/book3s_segment.S b/arch/powerpc/kvm/book3s_segment.S index 4798a84..419e44f 100644 --- a/arch/powerpc/kvm/book3s_segment.S +++ b/arch/powerpc/kvm/book3s_segment.S @@ -147,7 +147,7 @@ no_dcbz32_on: PPC_LL r9, SVCPU_R9(r3) PPC_LL r3, (SVCPU_R3)(r3) - RFI + RFI_TO_GUEST kvmppc_handler_trampoline_enter_end: @@ -371,5 +371,5 @@ END_FTR_SECTION_IFSET(CPU_FTR_HVMODE) cmpwi r12, BOOK3S_INTERRUPT_PERFMON beqa BOOK3S_INTERRUPT_PERFMON - RFI + RFI_TO_KERNEL kvmppc_handler_trampoline_exit_end: -- 2.7.4