bpf: Clean up all resources when register_fprobe_ips returns an error
Subsystems (5)
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.
--- kernel/trace/bpf_trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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; }return bpf_link_settle (&link_primer);
Signature · 1 line
2.34.1
Quoted 19 lines · Chuang Wang
When
register_fprobe_ipsreturns an error,bpf_link_cleanupjust cleans up bpf_link_primer's resources and forgets to clean upbpf_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")Signed-off-by Chuang Wang <[email protected]>--- kernel/trace/bpf_trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/trace/bpf_trace.c +0
-0
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
Sorry, I didn't notice this.
Quoted 40 lines · Jiri Olsa
Quoted 19 lines · Chuang Wang
When
register_fprobe_ipsreturns an error,bpf_link_cleanupjust cleans up bpf_link_primer's resources and forgets to clean upbpf_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")Signed-off-by Chuang Wang <[email protected]>--- kernel/trace/bpf_trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/trace/bpf_trace.c +0
-0kernel/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 inbpf_link_cleanupdo 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