From d3b8088c41a0f845bd86947af22907eba264ee31 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Thu, 11 Jan 2018 22:12:59 +1100 Subject: [PATCH 17/26] UBUNTU: SAUCE: rfi-flush: Move rfi_flush_fallback_area to end of paca CVE-2017-5754 This was an oversight, it should be at the end of the paca, as that reduces the risk of a kABI breakage. This also matches upstream. Signed-off-by: Michael Ellerman Signed-off-by: Stefan Bader --- arch/powerpc/include/asm/paca.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h index 20aa58b..e388994 100644 --- a/arch/powerpc/include/asm/paca.h +++ b/arch/powerpc/include/asm/paca.h @@ -153,8 +153,6 @@ struct paca_struct { struct opal_machine_check_event *opal_mc_evt; #endif #ifdef CONFIG_PPC_BOOK3S_64 - void *rfi_flush_fallback_area; - /* Exclusive emergency stack pointer for machine check exception. */ void *mc_emergency_sp; /* @@ -189,6 +187,7 @@ struct paca_struct { * other paca data leaking into the L1d */ u64 exrfi[13] __aligned(0x80); + void *rfi_flush_fallback_area; u64 l1d_flush_congruence; u64 l1d_flush_sets; #endif -- 2.7.4