From c9f283be898ba57253d265a7266ac81dfefa5fbe Mon Sep 17 00:00:00 2001 From: Breno Leitao Date: Tue, 16 Jan 2018 08:03:00 -0500 Subject: [PATCH 23/26] UBUNTU: SAUCE: powerpc/kernel: Fix instructions usage CVE-2017-5754 Currently the kernel compilation is failing with: /home/ubuntu/kernel/linux-private/arch/powerpc/kernel/exceptions-64s.S: Assembler messages: /home/ubuntu/kernel/linux-private/arch/powerpc/kernel/exceptions-64s.S:706: CC kernel/irq/spurious.o Error: wrong number of operands Fixing the argument for srdi to avoid the error: Signed-off-by: Breno Leitao Signed-off-by: Stefan Bader --- arch/powerpc/kernel/exceptions-64s.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index d7f37ac4..5efa935 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -703,7 +703,7 @@ hrfi_flush_fallback: mfctr r9 ld r10,PACA_RFI_FLUSH_FALLBACK_AREA(r13) ld r11,PACA_L1D_FLUSH_SIZE(r13) - srdi r11,r11(7 + 3) /* 128 byte lines, unrolled 8x */ + srdi r11,r11,11 /* 128 byte lines, unrolled 8x */ mtctr r11 DCBT_STOP_ALL_STREAM_IDS(r11) /* Stop prefetch streams */ -- 2.7.4