x86,bpf: use bpf_prog_report_probe_violation for x86

image-dragon · Kernel Patches Daemon · commit cee5f3115634 · 2025-09-26T23:15:02.000-07:00
Use bpf_prog_report_probe_violation() to report the memory probe fault
in ex_handler_bpf().

Signed-off-by: Menglong Dong &lt;menglong.dong@linux.dev&gt;
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
@@ -1470,6 +1470,8 @@ bool ex_handler_bpf(const struct exception_table_entry *x, struct pt_regs *regs)
 		off = FIELD_GET(DATA_ARENA_OFFSET_MASK, x->data);
 		addr = *(unsigned long *)((void *)regs + arena_reg) + off;
 		bpf_prog_report_arena_violation(is_write, addr, regs->ip);
+	} else {
+		bpf_prog_report_probe_violation(is_write, regs->ip);
 	}
 
 	/* jump over faulting load and clear dest register */

Original file line number	Diff line number	Diff line change
`@@ -1470,6 +1470,8 @@ bool ex_handler_bpf(const struct exception_table_entry x, struct pt_regs regs)`
`1470`	`1470`	`off = FIELD_GET(DATA_ARENA_OFFSET_MASK, x->data);`
`1471`	`1471`	`addr = (unsigned long )((void *)regs + arena_reg) + off;`
`1472`	`1472`	`bpf_prog_report_arena_violation(is_write, addr, regs->ip);`
	`1473`	`+ } else {`
	`1474`	`+ bpf_prog_report_probe_violation(is_write, regs->ip);`
`1473`	`1475`	`}`
`1474`	`1476`
`1475`	`1477`	`/* jump over faulting load and clear dest register */`