* [PATCH bpf-next] libbpf: fix memory leak when emitting final btf_ext
@ 2021-03-27 4:25 Andrii Nakryiko
2021-03-29 15:54 ` Song Liu
2021-03-30 16:32 ` Alexei Starovoitov
0 siblings, 2 replies; 3+ messages in thread
From: Andrii Nakryiko @ 2021-03-27 4:25 UTC (permalink / raw)
To: bpf, netdev, ast, daniel; +Cc: andrii, kernel-team
Free temporary allocated memory used to construct finalized .BTF.ext data.
Found by Coverity static analysis on libbpf's Github repo.
Fixes: 8fd27bf69b86 ("libbpf: Add BPF static linker BTF and BTF.ext support")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---
tools/lib/bpf/linker.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/tools/lib/bpf/linker.c b/tools/lib/bpf/linker.c
index a29d62ff8041..46b16cbdcda3 100644
--- a/tools/lib/bpf/linker.c
+++ b/tools/lib/bpf/linker.c
@@ -1906,8 +1906,10 @@ static int finalize_btf_ext(struct bpf_linker *linker)
struct dst_sec *sec = &linker->secs[i];
sz = emit_btf_ext_data(linker, cur, sec->sec_name, &sec->func_info);
- if (sz < 0)
- return sz;
+ if (sz < 0) {
+ err = sz;
+ goto out;
+ }
cur += sz;
}
@@ -1921,8 +1923,10 @@ static int finalize_btf_ext(struct bpf_linker *linker)
struct dst_sec *sec = &linker->secs[i];
sz = emit_btf_ext_data(linker, cur, sec->sec_name, &sec->line_info);
- if (sz < 0)
- return sz;
+ if (sz < 0) {
+ err = sz;
+ goto out;
+ }
cur += sz;
}
@@ -1936,8 +1940,10 @@ static int finalize_btf_ext(struct bpf_linker *linker)
struct dst_sec *sec = &linker->secs[i];
sz = emit_btf_ext_data(linker, cur, sec->sec_name, &sec->core_relo_info);
- if (sz < 0)
- return sz;
+ if (sz < 0) {
+ err = sz;
+ goto out;
+ }
cur += sz;
}
@@ -1948,8 +1954,10 @@ static int finalize_btf_ext(struct bpf_linker *linker)
if (err) {
linker->btf_ext = NULL;
pr_warn("failed to parse final .BTF.ext data: %d\n", err);
- return err;
+ goto out;
}
- return 0;
+out:
+ free(data);
+ return err;
}
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH bpf-next] libbpf: fix memory leak when emitting final btf_ext
2021-03-27 4:25 [PATCH bpf-next] libbpf: fix memory leak when emitting final btf_ext Andrii Nakryiko
@ 2021-03-29 15:54 ` Song Liu
2021-03-30 16:32 ` Alexei Starovoitov
1 sibling, 0 replies; 3+ messages in thread
From: Song Liu @ 2021-03-29 15:54 UTC (permalink / raw)
To: Andrii Nakryiko
Cc: bpf, Networking, Alexei Starovoitov, Daniel Borkmann, Kernel Team
On Fri, Mar 26, 2021 at 9:35 PM Andrii Nakryiko <andrii@kernel.org> wrote:
>
> Free temporary allocated memory used to construct finalized .BTF.ext data.
> Found by Coverity static analysis on libbpf's Github repo.
>
> Fixes: 8fd27bf69b86 ("libbpf: Add BPF static linker BTF and BTF.ext support")
> Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Song Liu <songliubraving@fb.com>
> ---
> tools/lib/bpf/linker.c | 24 ++++++++++++++++--------
> 1 file changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/tools/lib/bpf/linker.c b/tools/lib/bpf/linker.c
> index a29d62ff8041..46b16cbdcda3 100644
> --- a/tools/lib/bpf/linker.c
> +++ b/tools/lib/bpf/linker.c
> @@ -1906,8 +1906,10 @@ static int finalize_btf_ext(struct bpf_linker *linker)
> struct dst_sec *sec = &linker->secs[i];
>
> sz = emit_btf_ext_data(linker, cur, sec->sec_name, &sec->func_info);
> - if (sz < 0)
> - return sz;
> + if (sz < 0) {
> + err = sz;
> + goto out;
> + }
>
> cur += sz;
> }
> @@ -1921,8 +1923,10 @@ static int finalize_btf_ext(struct bpf_linker *linker)
> struct dst_sec *sec = &linker->secs[i];
>
> sz = emit_btf_ext_data(linker, cur, sec->sec_name, &sec->line_info);
> - if (sz < 0)
> - return sz;
> + if (sz < 0) {
> + err = sz;
> + goto out;
> + }
>
> cur += sz;
> }
> @@ -1936,8 +1940,10 @@ static int finalize_btf_ext(struct bpf_linker *linker)
> struct dst_sec *sec = &linker->secs[i];
>
> sz = emit_btf_ext_data(linker, cur, sec->sec_name, &sec->core_relo_info);
> - if (sz < 0)
> - return sz;
> + if (sz < 0) {
> + err = sz;
> + goto out;
> + }
>
> cur += sz;
> }
> @@ -1948,8 +1954,10 @@ static int finalize_btf_ext(struct bpf_linker *linker)
> if (err) {
> linker->btf_ext = NULL;
> pr_warn("failed to parse final .BTF.ext data: %d\n", err);
> - return err;
> + goto out;
> }
>
> - return 0;
> +out:
> + free(data);
> + return err;
> }
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH bpf-next] libbpf: fix memory leak when emitting final btf_ext
2021-03-27 4:25 [PATCH bpf-next] libbpf: fix memory leak when emitting final btf_ext Andrii Nakryiko
2021-03-29 15:54 ` Song Liu
@ 2021-03-30 16:32 ` Alexei Starovoitov
1 sibling, 0 replies; 3+ messages in thread
From: Alexei Starovoitov @ 2021-03-30 16:32 UTC (permalink / raw)
To: Andrii Nakryiko, bpf, netdev, daniel; +Cc: kernel-team
On 3/26/21 9:25 PM, Andrii Nakryiko wrote:
> Free temporary allocated memory used to construct finalized .BTF.ext data.
> Found by Coverity static analysis on libbpf's Github repo.
>
> Fixes: 8fd27bf69b86 ("libbpf: Add BPF static linker BTF and BTF.ext support")
> Signed-off-by: Andrii Nakryiko<andrii@kernel.org>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-30 16:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-27 4:25 [PATCH bpf-next] libbpf: fix memory leak when emitting final btf_ext Andrii Nakryiko
2021-03-29 15:54 ` Song Liu
2021-03-30 16:32 ` Alexei Starovoitov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).