Home Home > GIT Browse > openSUSE-42.2
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2018-01-12 15:07:37 +0100
committerJiri Slaby <jslaby@suse.cz>2018-01-12 15:07:53 +0100
commit99794cc00d09fac47259c1a396fd56eadcf9013c (patch)
treed606605f7aef572dee81ec366ee694ef465f20bc
parentd7c2f705daee99c94fda94ce8883c84851ddafe2 (diff)
Delete
patches.suse/0002-bpf-prevent-speculative-execution-in-eBPF-interprete.patch. This has been just replaced by the proper upstream solution. suse-commit: 1a6ba62b7d86eefe3e0d2ba1453ce6635a478bb9
-rw-r--r--kernel/bpf/core.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index 39b2749175e1..3fd76cf0c21e 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -29,7 +29,6 @@
#include <linux/bpf.h>
#include <asm/unaligned.h>
-#include <asm/barrier.h>
/* Registers */
#define BPF_R0 regs[BPF_REG_0]
@@ -428,7 +427,6 @@ select_insn:
DST = IMM;
CONT;
LD_IMM_DW:
- gmb();
DST = (u64) (u32) insn[0].imm | ((u64) (u32) insn[1].imm) << 32;
insn++;
CONT;
@@ -643,7 +641,6 @@ out:
*(SIZE *)(unsigned long) (DST + insn->off) = IMM; \
CONT; \
LDX_MEM_##SIZEOP: \
- gmb(); \
DST = *(SIZE *)(unsigned long) (SRC + insn->off); \
CONT;