[PATCH bpf-next] libbpf: fix memory leak in attach_tp for target-less tracepoint program

[PATCH bpf-next] libbpf: fix memory leak in attach_tp for target-less tracepoint program

[Andrii Nakryiko]

Fix sec_name memory leak if user defines target-less SEC("tp").

Fixes: 9af8efc45eb1 ("libbpf: Allow "incomplete" basic tracing SEC() definitions")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---
 tools/lib/bpf/libbpf.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 9aae886cbabf..ef7f302e542f 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -11592,16 +11592,16 @@ static int attach_tp(const struct bpf_program *prog, long cookie, struct bpf_lin
 {
 	char *sec_name, *tp_cat, *tp_name;
 
-	sec_name = strdup(prog->sec_name);
-	if (!sec_name)
-		return -ENOMEM;
-
 	*link = NULL;
 
 	/* no auto-attach for SEC("tp") or SEC("tracepoint") */
 	if (strcmp(prog->sec_name, "tp") == 0 || strcmp(prog->sec_name, "tracepoint") == 0)
 		return 0;
 
+	sec_name = strdup(prog->sec_name);
+	if (!sec_name)
+		return -ENOMEM;
+
 	/* extract "tp/<category>/<name>" or "tracepoint/<category>/<name>" */
 	if (str_has_pfx(prog->sec_name, "tp/"))
 		tp_cat = sec_name + sizeof("tp/") - 1;
-- 
2.30.2

Re: [PATCH bpf-next] libbpf: fix memory leak in attach_tp for target-less tracepoint program

[David Vernet]

On Mon, May 16, 2022 at 11:45:47AM -0700, Andrii Nakryiko wrote:
> Fix sec_name memory leak if user defines target-less SEC("tp").
> 
> Fixes: 9af8efc45eb1 ("libbpf: Allow "incomplete" basic tracing SEC() definitions")
> Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
> ---

LGTM

Acked-by: David Vernet <void@manifault.com>

Re: [PATCH bpf-next] libbpf: fix memory leak in attach_tp for target-less tracepoint program

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Alexei Starovoitov <ast@kernel.org>:

On Mon, 16 May 2022 11:45:47 -0700 you wrote:
> Fix sec_name memory leak if user defines target-less SEC("tp").
> 
> Fixes: 9af8efc45eb1 ("libbpf: Allow "incomplete" basic tracing SEC() definitions")
> Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
> ---
>  tools/lib/bpf/libbpf.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

Here is the summary with links:
  - [bpf-next] libbpf: fix memory leak in attach_tp for target-less tracepoint program
    https://git.kernel.org/bpf/bpf-next/c/ac6a65868a5a

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html