Skip to contentSkip to conversation

bpf: Reject variable offset alu on PTR_TO_FLOW_KEYS

PATCH Superseded Hao Sun 1 participant 3 messages Jan 10, 2024

Subsystems (4)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Hao Sun

author
#0 lore raw

PATCH v2 1/2 bpf: Reject variable offset alu on PTR_TO_FLOW_KEYS

For PTR_TO_FLOW_KEYS, check_flow_keys_access() only uses fixed off for validation. However, variable offset ptr alu is not prohibited for this ptr kind. So the variable offset is not checked.

The following prog is accepted:
func#0 @0
0: R1=ctx() R10=fp0

0: (bf) r6 = r1                       ; R1=ctx() R6_w=ctx()
1: (79) r7 = *(u64 *)(r6 +144)        ; R6_w=ctx() R7_w=flow_keys()
2: (b7) r8 = 1024                     ; R8_w=1024
3: (37) r8 /= 1                       ; R8_w=scalar()
4: (57) r8 &= 1024                    ; R8_w=scalar(smin=smin32=0,

smax=umax=smax32=umax32=1024,var_off=(0x0; 0x400))
5: (0f) r7 += r8
mark_precise: frame0: last_idx 5 first_idx 0 subseq_idx -1
mark_precise: frame0: regs=r8 stack= before 4: (57) r8 &= 1024
mark_precise: frame0: regs=r8 stack= before 3: (37) r8 /= 1
mark_precise: frame0: regs=r8 stack= before 2: (b7) r8 = 1024 6: R7_w=flow_keys(smin=smin32=0,smax=umax=smax32=umax32=1024,var_off =(0x0; 0x400)) R8_w=scalar(smin=smin32=0,smax=umax=smax32=umax32=1024, var_off=(0x0; 0x400))
6: (79) r0 = *(u64 *)(r7 +0) ; R0_w=scalar()
7: (95) exit

This prog loads flow_keys to r7, and adds the variable offset r8 to r7, and finally causes out-of-bounds access:

BUG: unable to handle page fault for address: ffffc90014c80038
...
Call Trace:
 <TASK>
 bpf_dispatcher_nop_func include/linux/bpf.h:1231 [inline]
 __bpf_prog_run include/linux/filter.h:651 [inline]
 bpf_prog_run include/linux/filter.h:658 [inline]
 bpf_prog_run_pin_on_cpu include/linux/filter.h:675 [inline]
 bpf_flow_dissect+0x15f/0x350 net/core/flow_dissector.c:991
 bpf_prog_test_run_flow_dissector+0x39d/0x620 net/bpf/test_run.c:1359
 bpf_prog_test_run kernel/bpf/syscall.c:4107 [inline]
 __sys_bpf+0xf8f/0x4560 kernel/bpf/syscall.c:5475
 __do_sys_bpf kernel/bpf/syscall.c:5561 [inline]
 __se_sys_bpf kernel/bpf/syscall.c:5559 [inline]
 __x64_sys_bpf+0x73/0xb0 kernel/bpf/syscall.c:5559
 do_syscall_x64 arch/x86/entry/common.c:52 [inline]
 do_syscall_64+0x3f/0x110 arch/x86/entry/common.c:83
 entry_SYSCALL_64_after_hwframe+0x63/0x6b

Fix this by rejecting ptr alu with variable offset on flow_keys. Applying the patch makes the program rejected with "R7 pointer arithmetic on flow_keys prohibited"

Fixes d58e468b1112 ("flow_dissector: implements flow dissector BPF hook")
---
 kernel/bpf/verifier.c | 4 ++++
 1 file changed, 4 insertions(+)
kernel/bpf/verifier.c +4 -0
index adbf330d364b..65f598694d55 100644
@@ -12826,6 +12826,10 @@ static int adjust_ptr_min_max_vals(struct bpf_verifier_env *env,
 	}
 
 	switch (base_type(ptr_reg->type)) {
+	case PTR_TO_FLOW_KEYS:
+		if (known)
+			break;
+		fallthrough;
 	case CONST_PTR_TO_MAP:
 		/* smin_val represents the known value */
 		if (known && smin_val == 0 && opcode == BPF_ADD)
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH v2 2/2 selftests/bpf: Add tests for alu on PTR_TO_FLOW_KEYS

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

---
 .../bpf/progs/verifier_value_illegal_alu.c    | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c +37 -0
index 71814a753216..49089361c98a 100644
@@ -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";
Signature · 1 line
2.34.1
author
#2 lore raw

Re: [PATCH v2 2/2] selftests/bpf: Add tests for alu on PTR_TO_FLOW_KEYS

Quoted 44 lines · Hao Sun

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

---
 .../bpf/progs/verifier_value_illegal_alu.c    | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c +27 -0
index 71814a753216..49089361c98a 100644
@@ -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;                                                                \

tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c l0_%=: exit; \ · line 185

Quoted 10 lines
tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c +10 -0
+       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);
+}
+

The format here is strange and should be fixed later.
I'm also curious, why only fixed-off is used in check_flow_keys_access() for validation?