mirror of
https://github.com/nxp-imx/linux-imx.git
synced 2025-07-09 10:55:21 +02:00
Revert "bpf: fix unpopulated name_len field in perf_event link info"
This reverts commite5c2b971db
which is commit4deecdd29c
upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: If96fcef48cfa8a3507e6cc3d2d171af12594869c Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
parent
d132b93edf
commit
8780507bc3
|
@ -3440,16 +3440,15 @@ 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 *ulenp,
|
char __user *uname, u32 ulen,
|
||||||
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, ulen;
|
u32 prog_id;
|
||||||
size_t len;
|
size_t len;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
ulen = *ulenp;
|
|
||||||
if (!ulen ^ !uname)
|
if (!ulen ^ !uname)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
@ -3457,17 +3456,10 @@ 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;
|
||||||
|
@ -3492,7 +3484,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;
|
||||||
|
@ -3500,7 +3492,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()))
|
||||||
|
@ -3522,7 +3514,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;
|
||||||
|
@ -3531,7 +3523,6 @@ 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;
|
||||||
|
@ -3557,18 +3548,12 @@ 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 0;
|
return bpf_perf_link_fill_common(event, uname, ulen, NULL, NULL, NULL, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
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,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user