bpf: remove test patch for file non-existent back in 4.8.x

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

2 files changed, 0 insertions, 91 deletions

diff --git a/queue/bpf-enhance-verifier-to-understand-stack-pointer-ari.patch b/queue/bpf-enhance-verifier-to-understand-stack-pointer-ari.patch
deleted file mode 100644
index da9858e..0000000
--- a/queue/bpf-enhance-verifier-to-understand-stack-pointer-ari.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 332270fdc8b6fba07d059a9ad44df9e1a2ad4529 Mon Sep 17 00:00:00 2001
-From: Yonghong Song <yhs@fb.com>
-Date: Sat, 29 Apr 2017 22:52:42 -0700
-Subject: [PATCH] bpf: enhance verifier to understand stack pointer arithmetic
-
-commit 332270fdc8b6fba07d059a9ad44df9e1a2ad4529 upstream.
-
-llvm 4.0 and above generates the code like below:
-....
-440: (b7) r1 = 15
-441: (05) goto pc+73
-515: (79) r6 = *(u64 *)(r10 -152)
-516: (bf) r7 = r10
-517: (07) r7 += -112
-518: (bf) r2 = r7
-519: (0f) r2 += r1
-520: (71) r1 = *(u8 *)(r8 +0)
-521: (73) *(u8 *)(r2 +45) = r1
-....
-and the verifier complains "R2 invalid mem access 'inv'" for insn #521.
-This is because verifier marks register r2 as unknown value after #519
-where r2 is a stack pointer and r1 holds a constant value.
-
-Teach verifier to recognize "stack_ptr + imm" and
-"stack_ptr + reg with const val" as valid stack_ptr with new offset.
-
-Signed-off-by: Yonghong Song <yhs@fb.com>
-Acked-by: Martin KaFai Lau <kafai@fb.com>
-Acked-by: Daniel Borkmann <daniel@iogearbox.net>
-Signed-off-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 6f8b6ed690be..c2ff608c1984 100644
---- a/kernel/bpf/verifier.c
-+++ b/kernel/bpf/verifier.c
-@@ -1924,6 +1924,17 @@ static int check_alu_op(struct bpf_verifier_env *env, struct bpf_insn *insn)
- 			return 0;
- 		} else if (opcode == BPF_ADD &&
- 			   BPF_CLASS(insn->code) == BPF_ALU64 &&
-+			   dst_reg->type == PTR_TO_STACK &&
-+			   ((BPF_SRC(insn->code) == BPF_X &&
-+			     regs[insn->src_reg].type == CONST_IMM) ||
-+			    BPF_SRC(insn->code) == BPF_K)) {
-+			if (BPF_SRC(insn->code) == BPF_X)
-+				dst_reg->imm += regs[insn->src_reg].imm;
-+			else
-+				dst_reg->imm += insn->imm;
-+			return 0;
-+		} else if (opcode == BPF_ADD &&
-+			   BPF_CLASS(insn->code) == BPF_ALU64 &&
- 			   (dst_reg->type == PTR_TO_PACKET ||
- 			    (BPF_SRC(insn->code) == BPF_X &&
- 			     regs[insn->src_reg].type == PTR_TO_PACKET))) {
-diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c
-index d3395c192a24..3773562056da 100644
---- a/tools/testing/selftests/bpf/test_verifier.c
-+++ b/tools/testing/selftests/bpf/test_verifier.c
-@@ -1932,16 +1932,22 @@ static struct bpf_test tests[] = {
- 		.result = ACCEPT,
- 	},
- 	{
--		"unpriv: obfuscate stack pointer",
-+		"stack pointer arithmetic",
- 		.insns = {
--			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
--			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
--			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-+			BPF_MOV64_IMM(BPF_REG_1, 4),
-+			BPF_JMP_IMM(BPF_JA, 0, 0, 0),
-+			BPF_MOV64_REG(BPF_REG_7, BPF_REG_10),
-+			BPF_ALU64_IMM(BPF_ADD, BPF_REG_7, -10),
-+			BPF_ALU64_IMM(BPF_ADD, BPF_REG_7, -10),
-+			BPF_MOV64_REG(BPF_REG_2, BPF_REG_7),
-+			BPF_ALU64_REG(BPF_ADD, BPF_REG_2, BPF_REG_1),
-+			BPF_ST_MEM(0, BPF_REG_2, 4, 0),
-+			BPF_MOV64_REG(BPF_REG_2, BPF_REG_7),
-+			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, 8),
-+			BPF_ST_MEM(0, BPF_REG_2, 4, 0),
- 			BPF_MOV64_IMM(BPF_REG_0, 0),
- 			BPF_EXIT_INSN(),
- 		},
--		.errstr_unpriv = "R2 pointer arithmetic",
--		.result_unpriv = REJECT,
- 		.result = ACCEPT,
- 	},
- 	{
--- 
-2.12.0
-
diff --git a/queue/series b/queue/series
index 65e6929..81d1cb4 100644
--- a/queue/series
+++ b/queue/series
@@ -123,7 +123,6 @@ ALSA-hda-Fix-deadlock-of-controller-device-lock-at-u.patch
 sparc64-fix-fault-handling-in-NGbzero.S-and-GENbzero.patch
 macsec-dynamically-allocate-space-for-sglist.patch
 tcp-do-not-underestimate-skb-truesize-in-tcp_trim_he.patch
-bpf-enhance-verifier-to-understand-stack-pointer-ari.patch
 bpf-arm64-fix-jit-branch-offset-related-to-ldimm64.patch
 tcp-fix-wraparound-issue-in-tcp_lp.patch
 net-ipv6-Do-not-duplicate-DAD-on-link-up.patch