Commit 6b51935a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 

Daniel Borkmann says:

====================
pull-request: bpf 2022-05-28

We've added 2 non-merge commits during the last 1 day(s) which contain
a total of 2 files changed, 6 insertions(+), 10 deletions(-).

The main changes are:

1) Fix ldx_probe_mem instruction in interpreter by properly zero-extending
   the bpf_probe_read_kernel() read content, from Menglong Dong.

2) Fix stacktrace_build_id BPF selftest given urandom_read has been renamed
   into urandom_read_iter in random driver, from Song Liu.

* https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf:
  bpf: Fix probe read error in ___bpf_prog_run()
  selftests/bpf: fix stacktrace_build_id with missing kprobe/urandom_read
====================

Link: https://lore.kernel.org/r/20220527235042.8526-1-daniel@iogearbox.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 2c262b21 caff1fa4

kernel/bpf/core.c

+5 −9
Original line number Diff line number Diff line
@@ -1953,6 +1953,11 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn) 
		CONT;							\

	LDX_MEM_##SIZEOP:						\

		DST = *(SIZE *)(unsigned long) (SRC + insn->off);	\

		CONT;							\

	LDX_PROBE_MEM_##SIZEOP:						\

		bpf_probe_read_kernel(&DST, sizeof(SIZE),		\

				      (const void *)(long) (SRC + insn->off));	\

		DST = *((SIZE *)&DST);					\

		CONT;



	LDST(B,   u8)
@@ -1960,15 +1965,6 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn) 
	LDST(W,  u32)

	LDST(DW, u64)

#undef LDST

#define LDX_PROBE(SIZEOP, SIZE)							\

	LDX_PROBE_MEM_##SIZEOP:							\

		bpf_probe_read_kernel(&DST, SIZE, (const void *)(long) (SRC + insn->off));	\

		CONT;

	LDX_PROBE(B,  1)

	LDX_PROBE(H,  2)

	LDX_PROBE(W,  4)

	LDX_PROBE(DW, 8)

#undef LDX_PROBE



#define ATOMIC_ALU_OP(BOP, KOP)						\

		case BOP:						\

tools/testing/selftests/bpf/progs/test_stacktrace_build_id.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct { 
	__type(value, stack_trace_t);

} stack_amap SEC(".maps");



SEC("kprobe/urandom_read")

SEC("kprobe/urandom_read_iter")

int oncpu(struct pt_regs *args)

{

	__u32 max_len = sizeof(struct bpf_stack_build_id)