From: Daniel Borkmann <daniel@iogearbox.net>
Date: Wed, 12 Dec 2018 09:45:38 +0000 (+0100)
Subject: bpf: remove obsolete prog->aux sanitation in bpf_insn_prepare_dump
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9f8c1c5712954f9d8877ac55b18adbdf03e51e1f;p=openwrt%2Fstaging%2Fblogic.git

bpf: remove obsolete prog->aux sanitation in bpf_insn_prepare_dump

This logic is not needed anymore since we got rid of the verifier
rewrite that was using prog->aux address in f6069b9aa993 ("bpf:
fix redirect to map under tail calls").

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
---

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 7f1410d6fbe9..6ae062f1cf20 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -2032,13 +2032,6 @@ static struct bpf_insn *bpf_insn_prepare_dump(const struct bpf_prog *prog)
 			insns[i + 1].imm = 0;
 			continue;
 		}
-
-		if (!bpf_dump_raw_ok() &&
-		    imm == (unsigned long)prog->aux) {
-			insns[i].imm = 0;
-			insns[i + 1].imm = 0;
-			continue;
-		}
 	}
 
 	return insns;