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

ifstat, nstat: Check fdopen() return value 

Prevent passing NULL FILE pointer to fgets() later.

Fix both tools in a single patch since the code changes are basically
identical.

Signed-off-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
Phil Sutter 2017-08-24 11:46:31 +02:00 committed by Stephen Hemminger
parent ae4e21c93f
commit 6d02518fdc
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
misc/ifstat.c
View File

@ -992,12 +992,18 @@ int main(int argc, char *argv[])
&& verify_forging(fd) == 0) { && verify_forging(fd) == 0) {
FILE *sfp = fdopen(fd, "r"); FILE *sfp = fdopen(fd, "r");
load_raw_table(sfp); if (!sfp) {
if (hist_db && source_mismatch) { fprintf(stderr, "ifstat: fdopen failed: %s\n",
fprintf(stderr, "ifstat: history is stale, ignoring it.\n"); strerror(errno));
hist_db = NULL; close(fd);
} else {
load_raw_table(sfp);
if (hist_db && source_mismatch) {
fprintf(stderr, "ifstat: history is stale, ignoring it.\n");
hist_db = NULL;
}
fclose(sfp);
} }
fclose(sfp);
} else { } else {
if (fd >= 0) if (fd >= 0)
close(fd); close(fd);

16
misc/nstat.c
View File

@ -706,12 +706,18 @@ int main(int argc, char *argv[])
&& verify_forging(fd) == 0) { && verify_forging(fd) == 0) {
FILE *sfp = fdopen(fd, "r"); FILE *sfp = fdopen(fd, "r");
load_good_table(sfp); if (!sfp) {
if (hist_db && source_mismatch) { fprintf(stderr, "nstat: fdopen failed: %s\n",
fprintf(stderr, "nstat: history is stale, ignoring it.\n"); strerror(errno));
hist_db = NULL; close(fd);
} else {
load_good_table(sfp);
if (hist_db && source_mismatch) {
fprintf(stderr, "nstat: history is stale, ignoring it.\n");
hist_db = NULL;
}
fclose(sfp);
} }
fclose(sfp);
} else { } else {
if (fd >= 0) if (fd >= 0)
close(fd); close(fd);