Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2018-01-12 15:12:13 +0100
committerJiri Slaby <jslaby@suse.cz>2018-01-12 15:15:45 +0100
commit9270e0e8090984ef1556414d038ef00fce175e4f (patch)
treeb404d85c989986a3ce2fab39079571c5068d87bb
parent1ffcd57cb5fc03f840dda2b3e37e72104508fdc1 (diff)
- Refresh
patches.suse/bpf-prevent-out-of-bounds-speculation.patch. - Delete patches.suse/0004-bpf-prevent-speculative-execution-in-eBPF-interprete.patch. Update the upstream status of the former. And removed the latter as it has been just replaced by the proper upstream solution. suse-commit: 20ac09f5aa32b484e29ff1bae076697b589bfb00
-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 b28eca17804f..7b62df86be1d 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -33,7 +33,6 @@
#include <linux/rcupdate.h>
#include <asm/unaligned.h>
-#include <asm/barrier.h>
/* Registers */
#define BPF_R0 regs[BPF_REG_0]
@@ -933,7 +932,6 @@ select_insn:
DST = IMM;
CONT;
LD_IMM_DW:
- osb();
DST = (u64) (u32) insn[0].imm | ((u64) (u32) insn[1].imm) << 32;
insn++;
CONT;
@@ -1195,7 +1193,6 @@ out:
*(SIZE *)(unsigned long) (DST + insn->off) = IMM; \
CONT; \
LDX_MEM_##SIZEOP: \
- osb(); \
DST = *(SIZE *)(unsigned long) (SRC + insn->off); \
CONT;