From c96bedb9d97f89df2c888690f95ca14ea0dc8fe3 Mon Sep 17 00:00:00 2001 From: Michael Neuling Date: Mon, 8 Jan 2018 13:20:29 +0530 Subject: [PATCH 02/26] UBUNTU: SAUCE: powerpc: Remove dead code in sycall entry CVE-2017-5754 In: commit 742415d6b66bf09e3e73280178ef7ec85c90b7ee Author: Michael Neuling powerpc: Turn syscall handler into macros We converted the syscall entry code onto macros, but in doing this we introduced some cruft that's never run and should never have been added. This removes that code. Signed-off-by: Michael Neuling Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Stefan Bader --- arch/powerpc/kernel/exceptions-64s.S | 8 -------- 1 file changed, 8 deletions(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 2d2fbd4..45dff63 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -54,14 +54,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE) \ xori r12,r12,MSR_LE ; \ mtspr SPRN_SRR1,r12 ; \ RFI_TO_USER ; /* return to userspace */ \ - b . ; \ -2: mfspr r12,SPRN_SRR1 ; \ - andi. r12,r12,MSR_PR ; \ - bne 0b ; \ - mtspr SPRN_SRR0,r3 ; \ - mtspr SPRN_SRR1,r4 ; \ - mtspr SPRN_SDR1,r5 ; \ - RFI_TO_KERNEL ; \ b . ; /* prevent speculative execution */ #if defined(CONFIG_RELOCATABLE) -- 2.7.4