Re: [PATCH bpf] tools/bpf: only set obj->skeleton without err

From: Wei Fu
Date: Tue Jan 11 2022 - 12:09:57 EST


On Sun, Jan 09, 2022 at 06:04:45PM -0800, Andrii Nakryiko wrote:
> On Sat, Jan 8, 2022 at 12:40 AM Wei Fu <fuweid89@xxxxxxxxx> wrote:
> >
> > After `bpftool gen skeleton`, the ${bpf_app}.skel.h will provide that
> > ${bpf_app_name}__open helper to load bpf. If there is some error
> > like ENOMEM, the ${bpf_app_name}__open will rollback(free) the allocated
> > object, including `bpf_object_skeleton`.
> >
> > Since the ${bpf_app_name}__create_skeleton set the obj->skeleton first
> > and not rollback it when error, it will cause double-free in
> > ${bpf_app_name}__destory at ${bpf_app_name}__open. Therefore, we should
> > set the obj->skeleton before return 0;
> >
> > Signed-off-by: Wei Fu <fuweid89@xxxxxxxxx>
> > ---
> > tools/bpf/bpftool/gen.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
>
> Great catch! Added (please add it yourself in the future):
>
> Fixes: 5dc7a8b21144 ("bpftool, selftests/bpf: Embed object file inside
> skeleton")
>
> Also reworded the subject a bit. Pushed to bpf-next.

Sure! Thanks for the review.