Received-SPF: pass (google.com: domain of linux-kernel+bounces-22194-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: Hao Sun <sunhao.th@gmail.com>
To: bpf@vger.kernel.org
Cc: ppenkov@google.com,
	willemb@google.com,
	ast@kernel.org,
	linux-kernel@vger.kernel.org,
	Hao Sun <sunhao.th@gmail.com>
Subject: [PATCH v2 2/2] selftests/bpf: Add tests for alu on PTR_TO_FLOW_KEYS
Date: Wed, 10 Jan 2024 13:53:17 +0100
Message-ID: <20240110125317.13742-2-sunhao.th@gmail.com>
In-Reply-To: <20240110125317.13742-1-sunhao.th@gmail.com>
References: <20240110125317.13742-1-sunhao.th@gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Add two cases for PTR_TO_FLOW_KEYS alu. One for rejecting alu with
variable offset, another for fixed offset.

Signed-off-by: Hao Sun <sunhao.th@gmail.com>
---
 .../bpf/progs/verifier_value_illegal_alu.c    | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c b/tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c
index 71814a753216..49089361c98a 100644
--- a/tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c
+++ b/tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c
@@ -146,4 +146,41 @@ l0_%=:	exit;						\
 	: __clobber_all);
 }
 
+SEC("flow_dissector")
+__description("flow_keys illegal alu op with variable offset")
+__failure
+__msg("R7 pointer arithmetic on flow_keys prohibited")
+__naked void flow_keys_illegal_variable_offset_alu(void)
+{
+	asm volatile("							\
+	r6 = r1;								\
+	r7 = *(u64*)(r6 + %[flow_keys_off]);	\
+	r8 = 8;									\
+	r8 /= 1;								\
+	r8 &= 8;								\
+	r7 += r8;								\
+	r0 = *(u64*)(r7 + 0);					\
+	exit;									\
+"	:
+	: __imm_const(flow_keys_off, offsetof(struct __sk_buff, flow_keys))
+	: __clobber_all);
+}
+
+SEC("flow_dissector")
+__description("flow_keys valid alu op with fixed offset")
+__success
+__naked void flow_keys_legal_fixed_offset_alu(void)
+{
+	asm volatile("							\
+	r6 = r1;								\
+	r7 = *(u64*)(r6 + %[flow_keys_off]);	\
+	r8 = 8;									\
+	r7 += r8;								\
+	r0 = *(u64*)(r7 + 0);					\
+	exit;									\
+"	:
+	: __imm_const(flow_keys_off, offsetof(struct __sk_buff, flow_keys))
+	: __clobber_all);
+}
+
 char _license[] SEC("license") = "GPL";
-- 
2.34.1