From a834b261b2aac0cae45932dc73790734ffd1d433 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Wed, 31 Jan 2018 15:38:34 +0000 Subject: [PATCH 048/104] Revert "locking/barriers: introduce new memory barrier gmb()" CVE-2017-5753 (revert embargoed) CVE-2017-5715 (revert embargoed) This reverts commit 6834bd7e6159da957a6c01deebf16132a694bc23. Signed-off-by: Andy Whitcroft --- arch/x86/include/asm/barrier.h | 3 --- include/asm-generic/barrier.h | 4 ---- 2 files changed, 7 deletions(-) diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h index aae78054cae2..bfb28caf97b1 100644 --- a/arch/x86/include/asm/barrier.h +++ b/arch/x86/include/asm/barrier.h @@ -23,9 +23,6 @@ #define wmb() asm volatile("sfence" ::: "memory") #endif -#define gmb() alternative_2("", "mfence", X86_FEATURE_MFENCE_RDTSC, \ - "lfence", X86_FEATURE_LFENCE_RDTSC); - #ifdef CONFIG_X86_PPRO_FENCE #define dma_rmb() rmb() #else diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h index 0ee1345c9222..fe297b599b0a 100644 --- a/include/asm-generic/barrier.h +++ b/include/asm-generic/barrier.h @@ -42,10 +42,6 @@ #define wmb() mb() #endif -#ifndef gmb -#define gmb() do { } while (0) -#endif - #ifndef dma_rmb #define dma_rmb() rmb() #endif -- 2.15.1