diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-09 19:37:10 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-09 19:37:10 -0500 |
| commit | 2c3c92bb91e085a916b3742340ed738335c38535 (patch) | |
| tree | 6e789cb6739f1d171dea03ecbc249e4f2408fffe | |
| parent | bbefc8bd5040e0203c9275701e40fe450f7e5989 (diff) | |
| download | longterm-queue-4.8-2c3c92bb91e085a916b3742340ed738335c38535.tar.gz | |
bpf: context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/bpf-don-t-let-ldimm64-leak-map-addresses-on-unprivil.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/queue/bpf-don-t-let-ldimm64-leak-map-addresses-on-unprivil.patch b/queue/bpf-don-t-let-ldimm64-leak-map-addresses-on-unprivil.patch index 0e1f8dd..c3f5c64 100644 --- a/queue/bpf-don-t-let-ldimm64-leak-map-addresses-on-unprivil.patch +++ b/queue/bpf-don-t-let-ldimm64-leak-map-addresses-on-unprivil.patch @@ -1,4 +1,4 @@ -From 0d0e57697f162da4aa218b5feafe614fb666db07 Mon Sep 17 00:00:00 2001 +From 51688b2aef5cd41778ca529a7a13178fd8742b6c Mon Sep 17 00:00:00 2001 From: Daniel Borkmann <daniel@iogearbox.net> Date: Mon, 8 May 2017 00:04:09 +0200 Subject: [PATCH] bpf: don't let ldimm64 leak map addresses on unprivileged @@ -27,10 +27,10 @@ Acked-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c -index c2ff608c1984..c5b56c92f8e2 100644 +index daea765d72e6..b49adc52a048 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c -@@ -298,7 +298,8 @@ static const char *const bpf_jmp_string[16] = { +@@ -328,7 +328,8 @@ static const char *const bpf_jmp_string[16] = { [BPF_EXIT >> 4] = "exit", }; @@ -40,7 +40,7 @@ index c2ff608c1984..c5b56c92f8e2 100644 { u8 class = BPF_CLASS(insn->code); -@@ -362,9 +363,19 @@ static void print_bpf_insn(struct bpf_insn *insn) +@@ -392,9 +393,19 @@ static void print_bpf_insn(struct bpf_insn *insn) insn->code, bpf_ldst_string[BPF_SIZE(insn->code) >> 3], insn->src_reg, insn->imm); @@ -63,7 +63,7 @@ index c2ff608c1984..c5b56c92f8e2 100644 } else { verbose("BUG_ld_%02x\n", insn->code); return; -@@ -2853,7 +2864,7 @@ static int do_check(struct bpf_verifier_env *env) +@@ -2273,7 +2284,7 @@ static int do_check(struct verifier_env *env) if (log_level) { verbose("%d: ", insn_idx); @@ -71,7 +71,7 @@ index c2ff608c1984..c5b56c92f8e2 100644 + print_bpf_insn(env, insn); } - err = ext_analyzer_insn_hook(env, insn_idx, prev_insn_idx); + if (class == BPF_ALU || class == BPF_ALU64) { -- 2.12.0 |