libbpf: fix memory leak in legacy kprobe attach logic
Andrii Nakryiko
maintainerPATCH 1/2 libbpf: fix memory leak in legacy kprobe attach logic
In some error scenarios legacy_probe string won't be free()'d. Fix this. This was reported by Coverity static analysis.
Fixes ca304b40c20d ("libbpf: Introduce legacy kprobe events support")
Signed-off-by Andrii Nakryiko <[email protected]>
--- tools/lib/bpf/libbpf.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
tools/lib/bpf/libbpf.c +7 -3
@@ -9365,10 +9365,11 @@ bpf_program__attach_kprobe_opts(const struct bpf_program *prog, offset, -1 /* pid */); }if (pfd <0 ) { + err = pfd;pr_warn ("prog '%s': failed to create %s '%s' perf event: %s\n" , prog->name, retprobe ?"kretprobe" :"kprobe" , func_name, -libbpf_strerror_r (pfd, errmsg,sizeof (errmsg))); -return libbpf_err_ptr (pfd); +libbpf_strerror_r (err, errmsg,sizeof (errmsg))); + goto err_out; } link =bpf_program__attach_perf_event_opts (prog, pfd, &pe_opts); err =libbpf_get_error (link);
@@ -9377,7 +9378,7 @@ bpf_program__attach_kprobe_opts(const struct bpf_program *prog,pr_warn ("prog '%s': failed to attach to %s '%s': %s\n" , prog->name, retprobe ?"kretprobe" :"kprobe" , func_name,libbpf_strerror_r (err, errmsg,sizeof (errmsg))); -return libbpf_err_ptr (err); + goto err_out; }if (legacy) { struct bpf_link_perf *perf_link = container_of(link, struct bpf_link_perf, link);
@@ -9387,6 +9388,9 @@ bpf_program__attach_kprobe_opts(const struct bpf_program *prog, }return link; +err_out: +free (legacy_probe); +return libbpf_err_ptr (err); } struct bpf_link *bpf_program__attach_kprobe(const struct bpf_program *prog,
Signature · 1 line
2.30.2
Andrii Nakryiko
maintainerPATCH 2/2 libbpf: fix legacy kprobe event creation FD error handling
open() returns -1 on error, not zero FD. Fix the error handling logic. Reported by Coverity statis analysis.
Fixes ca304b40c20d ("libbpf: Introduce legacy kprobe events support")
Signed-off-by Andrii Nakryiko <[email protected]>
--- tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/libbpf.c +1 -1
@@ -9036,7 +9036,7 @@ static int poke_kprobe_events(bool add, const char *name, bool retprobe, uint64_ } fd =open (file,O_WRONLY |O_APPEND ,0 ); -if (!fd) +if (fd <0 )return -errno; ret =write (fd, cmd,strlen (cmd));if (ret <0 )
Signature · 1 line
2.30.2
Re: [PATCH bpf-next 2/2] libbpf: fix legacy kprobe event creation FD error handling
Quoted 7 lines · Andrii Nakryiko
open()returns -1 on error, not zero FD. Fix the error handling logic. Reported by Coverity statis analysis.Fixes ca304b40c20d ("libbpf: Introduce legacy kprobe events support")Signed-off-by Andrii Nakryiko <[email protected]>---
This patch is superseded by a new patch series ([0]), please don't apply.
[0] https://patchwork.kernel.org/project/netdevbpf/list/?series=550083&state=*
Quoted 19 lines
tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/lib/bpf/libbpf.c +1
-2@@ -9036,7 +9036,7 @@ static int poke_kprobe_events(bool add, const char *name, bool retprobe, uint64_ } fd =open (file,O_WRONLY |O_APPEND ,0 ); -if (!fd) +if (fd <0 )return -errno; ret =write (fd, cmd,strlen (cmd));if (ret <0 ) --2.30.2