Skip to contentSkip to conversation

bpf: Clean up all resources when register_fprobe_ips returns an error

PATCH In review Chuang Wang 2 participants 3 messages Oct 25, 2022

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bpf: Clean up all resources when register_fprobe_ips returns an error

When register_fprobe_ips returns an error, bpf_link_cleanup just cleans up bpf_link_primer's resources and forgets to clean up bpf_kprobe_multi_link, addrs, cookies.

So, by adding 'goto error', this ensures that all resources are cleaned up.

Fixes 0dcac2725406 ("bpf: Add multi kprobe link")
---
 kernel/trace/bpf_trace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/bpf_trace.c +1 -1
index 1ed08967fb97..5b806ef20857 100644
@@ -2778,7 +2778,7 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr
 	err = register_fprobe_ips(&link->fp, addrs, cnt);
 	if (err) {
 		bpf_link_cleanup(&link_primer);
-		return err;
+		goto error;
 	}
 
 	return bpf_link_settle(&link_primer);
Signature · 1 line
2.34.1
#1 lore raw
Quoted 19 lines · Chuang Wang

When register_fprobe_ips returns an error, bpf_link_cleanup just cleans up bpf_link_primer's resources and forgets to clean up bpf_kprobe_multi_link, addrs, cookies.

So, by adding 'goto error', this ensures that all resources are cleaned up.

Fixes 0dcac2725406 ("bpf: Add multi kprobe link")
---
 kernel/trace/bpf_trace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/bpf_trace.c +0 -0
index 1ed08967fb97..5b806ef20857 100644

kernel/trace/bpf_trace.c int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr · line 2781

Quoted 5 lines
kernel/trace/bpf_trace.c +1 -1
@@ -2778,7 +2778,7 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr
 	err = register_fprobe_ips(&link->fp, addrs, cnt);
 	if (err) {
 		bpf_link_cleanup(&link_primer);
-		return err;
+		goto error;

that should be taken care of bpf_kprobe_multi_link_dealloc, through the fput path in bpf_link_cleanup

do you see any related memory leak like report in kmemleak?

jirka

Quoted 6 lines
kernel/trace/bpf_trace.c +0 -0
 	}
 
 	return bpf_link_settle(&link_primer);
Signature · 1 line
2.34.1
author
#2 lore raw

Sorry, I didn't notice this.

Quoted 40 lines · Jiri Olsa
Quoted 19 lines · Chuang Wang

When register_fprobe_ips returns an error, bpf_link_cleanup just cleans up bpf_link_primer's resources and forgets to clean up bpf_kprobe_multi_link, addrs, cookies.

So, by adding 'goto error', this ensures that all resources are cleaned up.

Fixes 0dcac2725406 ("bpf: Add multi kprobe link")
---
 kernel/trace/bpf_trace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/bpf_trace.c +0 -0
index 1ed08967fb97..5b806ef20857 100644

kernel/trace/bpf_trace.c int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr · line 2781

Quoted 5 lines
kernel/trace/bpf_trace.c +1 -1
@@ -2778,7 +2778,7 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr
      err = register_fprobe_ips(&link->fp, addrs, cnt);
      if (err) {
              bpf_link_cleanup(&link_primer);
-             return err;
+             goto error;

that should be taken care of bpf_kprobe_multi_link_dealloc, through the fput path in bpf_link_cleanup

do you see any related memory leak like report in kmemleak?

jirka

Quoted 6 lines
kernel/trace/bpf_trace.c +0 -1
      }
 
      return bpf_link_settle(&link_primer);
--

2.34.1