* [PATCH][next] bpf: fix memory leak on object 'data'
@ 2019-11-18 11:40 Colin King
2019-11-19 3:48 ` Alexei Starovoitov
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2019-11-18 11:40 UTC (permalink / raw)
To: David S . Miller, Alexei Starovoitov, Daniel Borkmann,
Martin KaFai Lau, Song Liu, Yonghong Song, Andrii Nakryiko,
netdev, bpf
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
The error return path on when bpf_fentry_test* tests fail does not
kfree 'data'. Fix this by adding the missing kfree.
Addresses-Coverity: ("Resource leak")
Fixes: faeb2dce084a ("bpf: Add kernel test functions for fentry testing")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
net/bpf/test_run.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c
index 62933279fbba..915c2d6f7fb9 100644
--- a/net/bpf/test_run.c
+++ b/net/bpf/test_run.c
@@ -161,8 +161,10 @@ static void *bpf_test_init(const union bpf_attr *kattr, u32 size,
bpf_fentry_test3(4, 5, 6) != 15 ||
bpf_fentry_test4((void *)7, 8, 9, 10) != 34 ||
bpf_fentry_test5(11, (void *)12, 13, 14, 15) != 65 ||
- bpf_fentry_test6(16, (void *)17, 18, 19, (void *)20, 21) != 111)
+ bpf_fentry_test6(16, (void *)17, 18, 19, (void *)20, 21) != 111) {
+ kfree(data);
return ERR_PTR(-EFAULT);
+ }
return data;
}
--
2.24.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH][next] bpf: fix memory leak on object 'data'
2019-11-18 11:40 [PATCH][next] bpf: fix memory leak on object 'data' Colin King
@ 2019-11-19 3:48 ` Alexei Starovoitov
0 siblings, 0 replies; 2+ messages in thread
From: Alexei Starovoitov @ 2019-11-19 3:48 UTC (permalink / raw)
To: Colin King
Cc: David S . Miller, Alexei Starovoitov, Daniel Borkmann,
Martin KaFai Lau, Song Liu, Yonghong Song, Andrii Nakryiko,
Network Development, bpf, kernel-janitors, LKML
On Mon, Nov 18, 2019 at 3:41 AM Colin King <colin.king@canonical.com> wrote:
>
> From: Colin Ian King <colin.king@canonical.com>
>
> The error return path on when bpf_fentry_test* tests fail does not
> kfree 'data'. Fix this by adding the missing kfree.
>
> Addresses-Coverity: ("Resource leak")
> Fixes: faeb2dce084a ("bpf: Add kernel test functions for fentry testing")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Applied. Thanks
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-11-19 3:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-18 11:40 [PATCH][next] bpf: fix memory leak on object 'data' Colin King
2019-11-19 3:48 ` 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).