[PATCH AUTOSEL 4.19 02/21] samples/bpf: Fix a resource leak

[PATCH AUTOSEL 4.19 02/21] samples/bpf: Fix a resource leak

[Sasha Levin]

From: Zhu Jun <zhujun2@cmss.chinamobile.com>

[ Upstream commit f3ef53174b23246fe9bc2bbc2542f3a3856fa1e2 ]

The opened file should be closed in show_sockopts(), otherwise resource
leak will occur that this problem was discovered by reading code

Signed-off-by: Zhu Jun <zhujun2@cmss.chinamobile.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20241010014126.2573-1-zhujun2@cmss.chinamobile.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 samples/bpf/test_cgrp2_sock.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/samples/bpf/test_cgrp2_sock.c b/samples/bpf/test_cgrp2_sock.c
index b0811da5a00f3..3f56519a1ccd7 100644
--- a/samples/bpf/test_cgrp2_sock.c
+++ b/samples/bpf/test_cgrp2_sock.c
@@ -174,8 +174,10 @@ static int show_sockopts(int family)
 		return 1;
 	}
 
-	if (get_bind_to_device(sd, name, sizeof(name)) < 0)
+	if (get_bind_to_device(sd, name, sizeof(name)) < 0) {
+		close(sd);
 		return 1;
+	}
 
 	mark = get_somark(sd);
 	prio = get_priority(sd);
-- 
2.43.0

Re: [PATCH AUTOSEL 4.19 02/21] samples/bpf: Fix a resource leak

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 812 bytes --]

Hi!

> [ Upstream commit f3ef53174b23246fe9bc2bbc2542f3a3856fa1e2 ]
> 
> The opened file should be closed in show_sockopts(), otherwise resource
> leak will occur that this problem was discovered by reading code

Well, code exits when this fails, so there's really no leak.

Best regards,
								Pavel

> +++ b/samples/bpf/test_cgrp2_sock.c
> @@ -174,8 +174,10 @@ static int show_sockopts(int family)
>  		return 1;
>  	}
>  
> -	if (get_bind_to_device(sd, name, sizeof(name)) < 0)
> +	if (get_bind_to_device(sd, name, sizeof(name)) < 0) {
> +		close(sd);
>  		return 1;
> +	}
>  
>  	mark = get_somark(sd);
>  	prio = get_priority(sd);

-- 
DENX Software Engineering GmbH,        Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]