Re: [PATCH bpf-next v4 09/14] selftests/bpf: Use log_err in network_helpers

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 4/16/24 3:13 AM, Geliang Tang wrote:
From: Geliang Tang <tanggeliang@xxxxxxxxxx>

The helpers ASSERT_OK/GE/OK_PTR should avoid using in public functions.
This patch uses log_err() to replace them in network_helpers.c, then
uses ASSERT_OK_PTR() to check the return values of all open_netns().

Signed-off-by: Geliang Tang <tanggeliang@xxxxxxxxxx>
---
  tools/testing/selftests/bpf/network_helpers.c | 19 ++++++++++++++-----
  .../selftests/bpf/prog_tests/empty_skb.c      |  2 ++
  .../bpf/prog_tests/ip_check_defrag.c          |  2 ++
  .../selftests/bpf/prog_tests/tc_redirect.c    |  2 +-
  .../selftests/bpf/prog_tests/test_tunnel.c    |  4 ++++
  .../selftests/bpf/prog_tests/xdp_metadata.c   | 16 ++++++++++++++++
  6 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c
index 836436688ca6..4fd3ab4fa72c 100644
--- a/tools/testing/selftests/bpf/network_helpers.c
+++ b/tools/testing/selftests/bpf/network_helpers.c
@@ -458,22 +458,30 @@ struct nstoken *open_netns(const char *name)
  	struct nstoken *token;
token = calloc(1, sizeof(struct nstoken));
-	if (!ASSERT_OK_PTR(token, "malloc token"))
+	if (!token) {
+		log_err("Failed to malloc token");
  		return NULL;
+	}
token->orig_netns_fd = open("/proc/self/ns/net", O_RDONLY);
-	if (!ASSERT_GE(token->orig_netns_fd, 0, "open /proc/self/ns/net"))
+	if (token->orig_netns_fd <= 0) {

The test is incorrect. just test == -1.

Also, I think there is an existing bug that orig_netns_fd will be leaked in the later "goto fail;" case.

+		log_err("Failed to open /proc/self/ns/net");
  		goto fail;
+	}
snprintf(nspath, sizeof(nspath), "%s/%s", "/var/run/netns", name);
  	nsfd = open(nspath, O_RDONLY | O_CLOEXEC);
-	if (!ASSERT_GE(nsfd, 0, "open netns fd"))
+	if (nsfd <= 0) {

Same here.

+		log_err("Failed to open netns fd");
  		goto fail;

I meant here regarding to the existing bug that leaks orig_netns_fd.






[Index of Archives]     [Linux Wireless]     [Linux Kernel]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Share Photos]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Device Mapper]

  Powered by Linux