picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

networkctl: avoid potential use of unitialized variables

Browse source 
Those values are based on a file we read from disk, so we should
verify everything we receive, and make sure everything we print
is sensible.

Also, print fractional seconds for TTL.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-01-01 12:00:59 -05:00
parent 1bf7dd6e7d
commit ba52f15a58
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/network/networkctl.c
View file

@ -898,7 +898,7 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) {
_cleanup_free_ LinkInfo *links = NULL;
const char *state, *word;
usec_t time, until, ttl;
double ttl = -1;
uint32_t capability;
int i, r, c, j;
size_t ll;
@ -964,13 +964,19 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) {
return -ENOMEM;
} else if (streq(a, "_TTL")) {
long long unsigned x;
usec_t time;
r = safe_atollu(b, &x);
if (r < 0 || (usec_t) x != x)
return log_warning_errno(r < 0 ? r : ERANGE,
"Failed to parse TTL \"%s\": %m", b);
time = now(CLOCK_BOOTTIME);
if (x < time)
continue;
sscanf(b, USEC_FMT, &until);
ttl = (until - time) / USEC_PER_SEC;
ttl = (double) (x - time) / USEC_PER_SEC;
} else if (streq(a, "_CAP")) {
sscanf(b, "%x", &capability);
@ -980,8 +986,11 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) {
}
if (until > time) {
printf("%10s %24s %16s %16"PRIu64" %16s\n", links[i].name, chassis, port, ttl, cap);
if (ttl >= 0) {
printf("%10s %24s %16s %16f %16s\n",
links[i].name,
strna(chassis), strna(port),
ttl, cap);
j++;
}
}