matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ss: Don't leak fd in tcp_show_netlink_file() 

Signed-off-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
Phil Sutter 2017-08-17 19:09:30 +02:00 committed by Stephen Hemminger
parent 08806fb019
commit 4b45ae221e
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
misc/ss.c
View File

@ -2688,41 +2688,44 @@ static int tcp_show_netlink_file(struct filter *f)
{ {
FILE *fp; FILE *fp;
char buf[16384]; char buf[16384];
int err = -1;
if ((fp = fopen(getenv("TCPDIAG_FILE"), "r")) == NULL) { if ((fp = fopen(getenv("TCPDIAG_FILE"), "r")) == NULL) {
perror("fopen($TCPDIAG_FILE)"); perror("fopen($TCPDIAG_FILE)");
return -1; return err;
} }
while (1) { while (1) {
int status, err; int status, err2;
struct nlmsghdr *h = (struct nlmsghdr *)buf; struct nlmsghdr *h = (struct nlmsghdr *)buf;
struct sockstat s = {}; struct sockstat s = {};
status = fread(buf, 1, sizeof(*h), fp); status = fread(buf, 1, sizeof(*h), fp);
if (status < 0) { if (status < 0) {
perror("Reading header from $TCPDIAG_FILE"); perror("Reading header from $TCPDIAG_FILE");
return -1; break;
} }
if (status != sizeof(*h)) { if (status != sizeof(*h)) {
perror("Unexpected EOF reading $TCPDIAG_FILE"); perror("Unexpected EOF reading $TCPDIAG_FILE");
return -1; break;
} }
status = fread(h+1, 1, NLMSG_ALIGN(h->nlmsg_len-sizeof(*h)), fp); status = fread(h+1, 1, NLMSG_ALIGN(h->nlmsg_len-sizeof(*h)), fp);
if (status < 0) { if (status < 0) {
perror("Reading $TCPDIAG_FILE"); perror("Reading $TCPDIAG_FILE");
return -1; break;
} }
if (status + sizeof(*h) < h->nlmsg_len) { if (status + sizeof(*h) < h->nlmsg_len) {
perror("Unexpected EOF reading $TCPDIAG_FILE"); perror("Unexpected EOF reading $TCPDIAG_FILE");
return -1; break;
} }
/* The only legal exit point */ /* The only legal exit point */
if (h->nlmsg_type == NLMSG_DONE) if (h->nlmsg_type == NLMSG_DONE) {
return 0; err = 0;
break;
}
if (h->nlmsg_type == NLMSG_ERROR) { if (h->nlmsg_type == NLMSG_ERROR) {
struct nlmsgerr *err = (struct nlmsgerr *)NLMSG_DATA(h); struct nlmsgerr *err = (struct nlmsgerr *)NLMSG_DATA(h);
@ -2733,7 +2736,7 @@ static int tcp_show_netlink_file(struct filter *f)
errno = -err->error; errno = -err->error;
perror("TCPDIAG answered"); perror("TCPDIAG answered");
} }
return -1; break;
} }
parse_diag_msg(h, &s); parse_diag_msg(h, &s);
@ -2742,10 +2745,15 @@ static int tcp_show_netlink_file(struct filter *f)
if (f && f->f && run_ssfilter(f->f, &s) == 0) if (f && f->f && run_ssfilter(f->f, &s) == 0)
continue; continue;
err = inet_show_sock(h, &s); err2 = inet_show_sock(h, &s);
if (err < 0) if (err2 < 0) {
return err; err = err2;
break;
}
} }
fclose(fp);
return err;
} }
static int tcp_show(struct filter *f, int socktype) static int tcp_show(struct filter *f, int socktype)