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 81cfae0f440cdea80d98f74d77e1a7c36c229eb6..02ac0fc539a5f1d10602e47d0a00583a71df503d 100644 (file)
--- 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);
 }