ss: Close file descriptors in tcp_show_netlink.
ss: Close file descriptors in tcp_show_netlink.
Signed-off-by: Matt Tierney <tierney@cs.nyu.edu>
diff --git a/misc/ss.c b/misc/ss.c
index eb42fd6..2caac4a 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -1563,6 +1563,7 @@
}
if (status == 0) {
fprintf(stderr, "EOF on netlink\n");
+ close(fd);
return 0;
}
@@ -1578,8 +1579,10 @@
h->nlmsg_seq != 123456)
goto skip_it;
- if (h->nlmsg_type == NLMSG_DONE)
+ if (h->nlmsg_type == NLMSG_DONE) {
+ close(fd);
return 0;
+ }
if (h->nlmsg_type == NLMSG_ERROR) {
struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h);
if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr))) {
@@ -1588,6 +1591,7 @@
errno = -err->error;
perror("TCPDIAG answers");
}
+ close(fd);
return 0;
}
if (!dump_fp) {
@@ -1596,8 +1600,10 @@
continue;
}
err = tcp_show_sock(h, NULL);
- if (err < 0)
+ if (err < 0) {
+ close(fd);
return err;
+ }
}
skip_it:
@@ -1612,6 +1618,7 @@
exit(1);
}
}
+ close(fd);
return 0;
}