Skip to content

Commit 4deecdd

Browse files
ver-nyanAlexei Starovoitov
authored andcommitted
bpf: fix unpopulated name_len field in perf_event link info
Previously when retrieving `bpf_link_info.perf_event` for kprobe/uprobe/tracepoint, the `name_len` field was not populated by the kernel, leaving it to reflect the value initially set by the user. This behavior was inconsistent with how other input/output string buffer fields function (e.g. `raw_tracepoint.tp_name_len`). This patch fills `name_len` with the actual size of the string name. Fixes: 1b715e1 ("bpf: Support ->fill_link_info for perf_event") Signed-off-by: Tyrone Wu <wudevelops@gmail.com> Acked-by: Jiri Olsa <jolsa@kernel.org> Acked-by: Yafang Shao <laoar.shao@gmail.com> Link: https://lore.kernel.org/r/20241008164312.46269-1-wudevelops@gmail.com Signed-off-by: Alexei Starovoitov <ast@kernel.org>
1 parent 4342476 commit 4deecdd

1 file changed

Lines changed: 22 additions & 7 deletions

File tree

kernel/bpf/syscall.c

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3565,26 +3565,34 @@ static void bpf_perf_link_dealloc(struct bpf_link *link)
35653565
}
35663566

35673567
static int bpf_perf_link_fill_common(const struct perf_event *event,
3568-
char __user *uname, u32 ulen,
3568+
char __user *uname, u32 *ulenp,
35693569
u64 *probe_offset, u64 *probe_addr,
35703570
u32 *fd_type, unsigned long *missed)
35713571
{
35723572
const char *buf;
3573-
u32 prog_id;
3573+
u32 prog_id, ulen;
35743574
size_t len;
35753575
int err;
35763576

3577+
ulen = *ulenp;
35773578
if (!ulen ^ !uname)
35783579
return -EINVAL;
35793580

35803581
err = bpf_get_perf_event_info(event, &prog_id, fd_type, &buf,
35813582
probe_offset, probe_addr, missed);
35823583
if (err)
35833584
return err;
3585+
3586+
if (buf) {
3587+
len = strlen(buf);
3588+
*ulenp = len + 1;
3589+
} else {
3590+
*ulenp = 1;
3591+
}
35843592
if (!uname)
35853593
return 0;
3594+
35863595
if (buf) {
3587-
len = strlen(buf);
35883596
err = bpf_copy_to_user(uname, buf, ulen, len);
35893597
if (err)
35903598
return err;
@@ -3609,15 +3617,15 @@ static int bpf_perf_link_fill_kprobe(const struct perf_event *event,
36093617

36103618
uname = u64_to_user_ptr(info->perf_event.kprobe.func_name);
36113619
ulen = info->perf_event.kprobe.name_len;
3612-
err = bpf_perf_link_fill_common(event, uname, ulen, &offset, &addr,
3620+
err = bpf_perf_link_fill_common(event, uname, &ulen, &offset, &addr,
36133621
&type, &missed);
36143622
if (err)
36153623
return err;
36163624
if (type == BPF_FD_TYPE_KRETPROBE)
36173625
info->perf_event.type = BPF_PERF_EVENT_KRETPROBE;
36183626
else
36193627
info->perf_event.type = BPF_PERF_EVENT_KPROBE;
3620-
3628+
info->perf_event.kprobe.name_len = ulen;
36213629
info->perf_event.kprobe.offset = offset;
36223630
info->perf_event.kprobe.missed = missed;
36233631
if (!kallsyms_show_value(current_cred()))
@@ -3639,7 +3647,7 @@ static int bpf_perf_link_fill_uprobe(const struct perf_event *event,
36393647

36403648
uname = u64_to_user_ptr(info->perf_event.uprobe.file_name);
36413649
ulen = info->perf_event.uprobe.name_len;
3642-
err = bpf_perf_link_fill_common(event, uname, ulen, &offset, &addr,
3650+
err = bpf_perf_link_fill_common(event, uname, &ulen, &offset, &addr,
36433651
&type, NULL);
36443652
if (err)
36453653
return err;
@@ -3648,6 +3656,7 @@ static int bpf_perf_link_fill_uprobe(const struct perf_event *event,
36483656
info->perf_event.type = BPF_PERF_EVENT_URETPROBE;
36493657
else
36503658
info->perf_event.type = BPF_PERF_EVENT_UPROBE;
3659+
info->perf_event.uprobe.name_len = ulen;
36513660
info->perf_event.uprobe.offset = offset;
36523661
info->perf_event.uprobe.cookie = event->bpf_cookie;
36533662
return 0;
@@ -3673,12 +3682,18 @@ static int bpf_perf_link_fill_tracepoint(const struct perf_event *event,
36733682
{
36743683
char __user *uname;
36753684
u32 ulen;
3685+
int err;
36763686

36773687
uname = u64_to_user_ptr(info->perf_event.tracepoint.tp_name);
36783688
ulen = info->perf_event.tracepoint.name_len;
3689+
err = bpf_perf_link_fill_common(event, uname, &ulen, NULL, NULL, NULL, NULL);
3690+
if (err)
3691+
return err;
3692+
36793693
info->perf_event.type = BPF_PERF_EVENT_TRACEPOINT;
3694+
info->perf_event.tracepoint.name_len = ulen;
36803695
info->perf_event.tracepoint.cookie = event->bpf_cookie;
3681-
return bpf_perf_link_fill_common(event, uname, ulen, NULL, NULL, NULL, NULL);
3696+
return 0;
36823697
}
36833698

36843699
static int bpf_perf_link_fill_perf_event(const struct perf_event *event,

0 commit comments

Comments
 (0)