Commit 4deecdd2 authored by Tyrone Wu's avatar Tyrone Wu Committed by Alexei Starovoitov

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: 1b715e1b ("bpf: Support ->fill_link_info for perf_event")
Signed-off-by: default avatarTyrone Wu <wudevelops@gmail.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarYafang Shao <laoar.shao@gmail.com>
Link: https://lore.kernel.org/r/20241008164312.46269-1-wudevelops@gmail.comSigned-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 43424763
...@@ -3565,15 +3565,16 @@ static void bpf_perf_link_dealloc(struct bpf_link *link) ...@@ -3565,15 +3565,16 @@ static void bpf_perf_link_dealloc(struct bpf_link *link)
} }
static int bpf_perf_link_fill_common(const struct perf_event *event, static int bpf_perf_link_fill_common(const struct perf_event *event,
char __user *uname, u32 ulen, char __user *uname, u32 *ulenp,
u64 *probe_offset, u64 *probe_addr, u64 *probe_offset, u64 *probe_addr,
u32 *fd_type, unsigned long *missed) u32 *fd_type, unsigned long *missed)
{ {
const char *buf; const char *buf;
u32 prog_id; u32 prog_id, ulen;
size_t len; size_t len;
int err; int err;
ulen = *ulenp;
if (!ulen ^ !uname) if (!ulen ^ !uname)
return -EINVAL; return -EINVAL;
...@@ -3581,10 +3582,17 @@ static int bpf_perf_link_fill_common(const struct perf_event *event, ...@@ -3581,10 +3582,17 @@ static int bpf_perf_link_fill_common(const struct perf_event *event,
probe_offset, probe_addr, missed); probe_offset, probe_addr, missed);
if (err) if (err)
return err; return err;
if (buf) {
len = strlen(buf);
*ulenp = len + 1;
} else {
*ulenp = 1;
}
if (!uname) if (!uname)
return 0; return 0;
if (buf) { if (buf) {
len = strlen(buf);
err = bpf_copy_to_user(uname, buf, ulen, len); err = bpf_copy_to_user(uname, buf, ulen, len);
if (err) if (err)
return err; return err;
...@@ -3609,7 +3617,7 @@ static int bpf_perf_link_fill_kprobe(const struct perf_event *event, ...@@ -3609,7 +3617,7 @@ static int bpf_perf_link_fill_kprobe(const struct perf_event *event,
uname = u64_to_user_ptr(info->perf_event.kprobe.func_name); uname = u64_to_user_ptr(info->perf_event.kprobe.func_name);
ulen = info->perf_event.kprobe.name_len; ulen = info->perf_event.kprobe.name_len;
err = bpf_perf_link_fill_common(event, uname, ulen, &offset, &addr, err = bpf_perf_link_fill_common(event, uname, &ulen, &offset, &addr,
&type, &missed); &type, &missed);
if (err) if (err)
return err; return err;
...@@ -3617,7 +3625,7 @@ static int bpf_perf_link_fill_kprobe(const struct perf_event *event, ...@@ -3617,7 +3625,7 @@ static int bpf_perf_link_fill_kprobe(const struct perf_event *event,
info->perf_event.type = BPF_PERF_EVENT_KRETPROBE; info->perf_event.type = BPF_PERF_EVENT_KRETPROBE;
else else
info->perf_event.type = BPF_PERF_EVENT_KPROBE; info->perf_event.type = BPF_PERF_EVENT_KPROBE;
info->perf_event.kprobe.name_len = ulen;
info->perf_event.kprobe.offset = offset; info->perf_event.kprobe.offset = offset;
info->perf_event.kprobe.missed = missed; info->perf_event.kprobe.missed = missed;
if (!kallsyms_show_value(current_cred())) if (!kallsyms_show_value(current_cred()))
...@@ -3639,7 +3647,7 @@ static int bpf_perf_link_fill_uprobe(const struct perf_event *event, ...@@ -3639,7 +3647,7 @@ static int bpf_perf_link_fill_uprobe(const struct perf_event *event,
uname = u64_to_user_ptr(info->perf_event.uprobe.file_name); uname = u64_to_user_ptr(info->perf_event.uprobe.file_name);
ulen = info->perf_event.uprobe.name_len; ulen = info->perf_event.uprobe.name_len;
err = bpf_perf_link_fill_common(event, uname, ulen, &offset, &addr, err = bpf_perf_link_fill_common(event, uname, &ulen, &offset, &addr,
&type, NULL); &type, NULL);
if (err) if (err)
return err; return err;
...@@ -3648,6 +3656,7 @@ static int bpf_perf_link_fill_uprobe(const struct perf_event *event, ...@@ -3648,6 +3656,7 @@ static int bpf_perf_link_fill_uprobe(const struct perf_event *event,
info->perf_event.type = BPF_PERF_EVENT_URETPROBE; info->perf_event.type = BPF_PERF_EVENT_URETPROBE;
else else
info->perf_event.type = BPF_PERF_EVENT_UPROBE; info->perf_event.type = BPF_PERF_EVENT_UPROBE;
info->perf_event.uprobe.name_len = ulen;
info->perf_event.uprobe.offset = offset; info->perf_event.uprobe.offset = offset;
info->perf_event.uprobe.cookie = event->bpf_cookie; info->perf_event.uprobe.cookie = event->bpf_cookie;
return 0; return 0;
...@@ -3673,12 +3682,18 @@ static int bpf_perf_link_fill_tracepoint(const struct perf_event *event, ...@@ -3673,12 +3682,18 @@ static int bpf_perf_link_fill_tracepoint(const struct perf_event *event,
{ {
char __user *uname; char __user *uname;
u32 ulen; u32 ulen;
int err;
uname = u64_to_user_ptr(info->perf_event.tracepoint.tp_name); uname = u64_to_user_ptr(info->perf_event.tracepoint.tp_name);
ulen = info->perf_event.tracepoint.name_len; ulen = info->perf_event.tracepoint.name_len;
err = bpf_perf_link_fill_common(event, uname, &ulen, NULL, NULL, NULL, NULL);
if (err)
return err;
info->perf_event.type = BPF_PERF_EVENT_TRACEPOINT; info->perf_event.type = BPF_PERF_EVENT_TRACEPOINT;
info->perf_event.tracepoint.name_len = ulen;
info->perf_event.tracepoint.cookie = event->bpf_cookie; info->perf_event.tracepoint.cookie = event->bpf_cookie;
return bpf_perf_link_fill_common(event, uname, ulen, NULL, NULL, NULL, NULL); return 0;
} }
static int bpf_perf_link_fill_perf_event(const struct perf_event *event, static int bpf_perf_link_fill_perf_event(const struct perf_event *event,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment