From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Tue, 24 Aug 2021 07:17:48 +0000 (+0200)
Subject: xdp: tiny refactoring, mute Coverity
X-Git-Tag: v3.1.2~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a397589e0014f8188a907960bb988ebcb8fe04e;p=thirdparty%2Fknot-dns.git

xdp: tiny refactoring, mute Coverity
---

diff --git a/src/libknot/xdp/bpf-user.c b/src/libknot/xdp/bpf-user.c
index f62acae296..d76341243f 100644
--- a/src/libknot/xdp/bpf-user.c
+++ b/src/libknot/xdp/bpf-user.c
@@ -102,6 +102,17 @@ static int ensure_prog(struct kxsk_iface *iface, bool overwrite)
 	}
 }
 
+static void unget_bpf_maps(struct kxsk_iface *iface)
+{
+	if (iface->qidconf_map_fd >= 0) {
+		close(iface->qidconf_map_fd);
+	}
+	if (iface->xsks_map_fd >= 0) {
+		close(iface->xsks_map_fd);
+	}
+	iface->qidconf_map_fd = iface->xsks_map_fd = -1;
+}
+
 /*!
  * /brief Get FDs for the two maps and assign them into xsk_info-> fields.
  *
@@ -154,9 +165,7 @@ static int get_bpf_maps(int prog_fd, struct kxsk_iface *iface)
 	}
 
 	if (iface->qidconf_map_fd < 0 || iface->xsks_map_fd < 0) {
-		close(iface->qidconf_map_fd);
-		close(iface->xsks_map_fd);
-		iface->qidconf_map_fd = iface->xsks_map_fd = -1;
+		unget_bpf_maps(iface);
 		free(map_ids);
 		return KNOT_ENOENT;
 	}
@@ -165,13 +174,6 @@ static int get_bpf_maps(int prog_fd, struct kxsk_iface *iface)
 	return KNOT_EOK;
 }
 
-static void unget_bpf_maps(struct kxsk_iface *iface)
-{
-	close(iface->qidconf_map_fd);
-	close(iface->xsks_map_fd);
-	iface->qidconf_map_fd = iface->xsks_map_fd = -1;
-}
-
 int kxsk_socket_start(const struct kxsk_iface *iface, uint32_t listen_port,
                       struct xsk_socket *xsk)
 {