diff mbox series

[bpf-next,v9,06/11] bpf: Fix context type resolving for extension programs

Message ID 160106910591.27725.1499697900366462609.stgit@toke.dk
State Changes Requested
Delegated to: BPF Maintainers
Headers show
Series bpf: Support multi-attach for freplace programs | expand

Commit Message

Toke Høiland-Jørgensen Sept. 25, 2020, 9:25 p.m. UTC
From: Toke Høiland-Jørgensen <toke@redhat.com>

Eelco reported we can't properly access arguments if the tracing
program is attached to extension program.

Having following program:

  int test_pkt_md_access(struct __sk_buff *skb)

with its extension:

  int test_pkt_md_access_new(struct __sk_buff *skb)

and tracing that extension with:

  int BPF_PROG(fentry, struct sk_buff *skb)

It's not possible to access skb argument in the fentry program,
with following error from verifier:

  ; int BPF_PROG(fentry, struct sk_buff *skb)
  0: (79) r1 = *(u64 *)(r1 +0)
  invalid bpf_context access off=0 size=8

The problem is that btf_ctx_access gets the context type for the
traced program, which is in this case the extension.

But when we trace extension program, we want to get the context
type of the program that the extension is attached to, so we can
access the argument properly in the trace program.

This version of the patch is tweaked slightly from Jiri's original one,
since the refactoring in the previous patches means we have to get the
target prog type from the new variable in prog->aux instead of directly
from the target prog.

Reported-by: Eelco Chaudron <echaudro@redhat.com>
Suggested-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
 kernel/bpf/btf.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
diff mbox series


diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index faf57c6f8804..7fd4757a573d 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -3860,7 +3860,14 @@  bool btf_ctx_access(int off, int size, enum bpf_access_type type,
 	info->reg_type = PTR_TO_BTF_ID;
 	if (dst_prog) {
-		ret = btf_translate_to_vmlinux(log, btf, t, dst_prog->type, arg);
+		enum bpf_prog_type dst_type;
+		if (dst_prog->type == BPF_PROG_TYPE_EXT)
+			dst_type = dst_prog->aux->saved_dst_prog_type;
+		else
+			dst_type = dst_prog->type;
+		ret = btf_translate_to_vmlinux(log, btf, t, dst_type, arg);
 		if (ret > 0) {
 			info->btf_id = ret;
 			return true;