Skip to content

Commit d7b67dd

Browse files
captain5050namhyung
authored andcommitted
perf bpf-event: Fix use-after-free in synthesis
Calls to perf_env__insert_bpf_prog_info may fail as a sideband thread may already have inserted the bpf_prog_info. Such failures may yield info_linear being freed which then causes use-after-free issues with the internal bpf_prog_info info struct. Make it so that perf_env__insert_bpf_prog_info trigger early non-error paths and fix the use-after-free in perf_event__synthesize_one_bpf_prog. Add proper return error handling to perf_env__add_bpf_info (that calls perf_env__insert_bpf_prog_info) and propagate the return value in its callers. Closes: https://lore.kernel.org/lkml/CAP-5=fWJQcmUOP7MuCA2ihKnDAHUCOBLkQFEkQES-1ZZTrgf8Q@mail.gmail.com/ Fixes: 03edb70 ("perf bpf: Fix two memory leakages when calling perf_env__insert_bpf_prog_info()") Reviewed-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Ian Rogers <irogers@google.com> Link: https://lore.kernel.org/r/20250902181713.309797-2-irogers@google.com Signed-off-by: Namhyung Kim <namhyung@kernel.org>
1 parent 2c369d9 commit d7b67dd

File tree

1 file changed

+27
-12
lines changed

1 file changed

+27
-12
lines changed

tools/perf/util/bpf-event.c

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -657,9 +657,15 @@ static int perf_event__synthesize_one_bpf_prog(struct perf_session *session,
657657
info_node->info_linear = info_linear;
658658
info_node->metadata = NULL;
659659
if (!perf_env__insert_bpf_prog_info(env, info_node)) {
660-
free(info_linear);
660+
/*
661+
* Insert failed, likely because of a duplicate event
662+
* made by the sideband thread. Ignore synthesizing the
663+
* metadata.
664+
*/
661665
free(info_node);
666+
goto out;
662667
}
668+
/* info_linear is now owned by info_node and shouldn't be freed below. */
663669
info_linear = NULL;
664670

665671
/*
@@ -827,18 +833,18 @@ int perf_event__synthesize_bpf_events(struct perf_session *session,
827833
return err;
828834
}
829835

830-
static void perf_env__add_bpf_info(struct perf_env *env, u32 id)
836+
static int perf_env__add_bpf_info(struct perf_env *env, u32 id)
831837
{
832838
struct bpf_prog_info_node *info_node;
833839
struct perf_bpil *info_linear;
834840
struct btf *btf = NULL;
835841
u64 arrays;
836842
u32 btf_id;
837-
int fd;
843+
int fd, err = 0;
838844

839845
fd = bpf_prog_get_fd_by_id(id);
840846
if (fd < 0)
841-
return;
847+
return -EINVAL;
842848

843849
arrays = 1UL << PERF_BPIL_JITED_KSYMS;
844850
arrays |= 1UL << PERF_BPIL_JITED_FUNC_LENS;
@@ -852,6 +858,7 @@ static void perf_env__add_bpf_info(struct perf_env *env, u32 id)
852858
info_linear = get_bpf_prog_info_linear(fd, arrays);
853859
if (IS_ERR_OR_NULL(info_linear)) {
854860
pr_debug("%s: failed to get BPF program info. aborting\n", __func__);
861+
err = PTR_ERR(info_linear);
855862
goto out;
856863
}
857864

@@ -862,38 +869,46 @@ static void perf_env__add_bpf_info(struct perf_env *env, u32 id)
862869
info_node->info_linear = info_linear;
863870
info_node->metadata = bpf_metadata_create(&info_linear->info);
864871
if (!perf_env__insert_bpf_prog_info(env, info_node)) {
872+
pr_debug("%s: duplicate add bpf info request for id %u\n",
873+
__func__, btf_id);
865874
free(info_linear);
866875
free(info_node);
876+
goto out;
867877
}
868-
} else
878+
} else {
869879
free(info_linear);
880+
err = -ENOMEM;
881+
goto out;
882+
}
870883

871884
if (btf_id == 0)
872885
goto out;
873886

874887
btf = btf__load_from_kernel_by_id(btf_id);
875-
if (libbpf_get_error(btf)) {
876-
pr_debug("%s: failed to get BTF of id %u, aborting\n",
877-
__func__, btf_id);
878-
goto out;
888+
if (!btf) {
889+
err = -errno;
890+
pr_debug("%s: failed to get BTF of id %u %d\n", __func__, btf_id, err);
891+
} else {
892+
perf_env__fetch_btf(env, btf_id, btf);
879893
}
880-
perf_env__fetch_btf(env, btf_id, btf);
881894

882895
out:
883896
btf__free(btf);
884897
close(fd);
898+
return err;
885899
}
886900

887901
static int bpf_event__sb_cb(union perf_event *event, void *data)
888902
{
889903
struct perf_env *env = data;
904+
int ret = 0;
890905

891906
if (event->header.type != PERF_RECORD_BPF_EVENT)
892907
return -1;
893908

894909
switch (event->bpf.type) {
895910
case PERF_BPF_EVENT_PROG_LOAD:
896-
perf_env__add_bpf_info(env, event->bpf.id);
911+
ret = perf_env__add_bpf_info(env, event->bpf.id);
897912

898913
case PERF_BPF_EVENT_PROG_UNLOAD:
899914
/*
@@ -907,7 +922,7 @@ static int bpf_event__sb_cb(union perf_event *event, void *data)
907922
break;
908923
}
909924

910-
return 0;
925+
return ret;
911926
}
912927

913928
int evlist__add_bpf_sb_event(struct evlist *evlist, struct perf_env *env)

0 commit comments

Comments
 (0)