From: Jeremy Sowden <jeremy@azazel.net>
Date: Sun, 25 Oct 2020 13:15:54 +0000 (+0100)
Subject: pknlusr: always close socket
X-Git-Tag: v3.12~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05cacbe84cfdeb08e3db8ee1b57f19655cd9ac14;p=thirdparty%2Fxtables-addons.git

pknlusr: always close socket

On some error paths, the socket was not being closed before exit.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---

diff --git a/extensions/pknock/pknlusr.c b/extensions/pknock/pknlusr.c
index 81cfae0..02ac0fc 100644
--- a/extensions/pknock/pknlusr.c
+++ b/extensions/pknock/pknlusr.c
@@ -27,22 +27,21 @@ int main(void)
 
 	if (sock_fd == -1) {
 		perror("socket()");
-		return 1;
+		exit(EXIT_FAILURE);
 	}
 
 	local_addr.nl_groups = group;
 	status = bind(sock_fd, (struct sockaddr *)&local_addr, sizeof(local_addr));
 	if (status == -1) {
-		close(sock_fd);
 		perror("bind()");
-		return 1;
+		goto err_close_sock;
 	}
 
 	nlmsg_size = NLMSG_SPACE(sizeof(*cn_msg) + sizeof(*pknock_msg));
 	nlmsg = malloc(nlmsg_size);
 	if (!nlmsg) {
 		perror("malloc()");
-		return 1;
+		goto err_close_sock;
 	}
 
 	while(1) {
@@ -53,7 +52,7 @@ int main(void)
 		status = recv(sock_fd, nlmsg, nlmsg_size, 0);
 		if (status < 0) {
 			perror("recv()");
-			return 1;
+			goto err_free_msg;
 		}
 		if (status == 0)
 			break;
@@ -63,7 +62,9 @@ int main(void)
 		printf("rule_name: %s - ip %s\n", pknock_msg->rule_name, ip);
 	}
 
-	close(sock_fd);
+err_free_msg:
 	free(nlmsg);
-	return 0;
+err_close_sock:
+	close(sock_fd);
+	exit(status == -1 ? EXIT_FAILURE : EXIT_SUCCESS);
 }