anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-06 12:45:13 +02:00
Code Issues Releases Wiki Activity

pknlusr: always close socket

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

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
This commit is contained in:
Jeremy Sowden
2020-10-25 14:15:54 +01:00
committed by Jan Engelhardt
parent 3c120ef5f1
commit 05cacbe84c
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/pknock/pknlusr.c
View File

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