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

tc: util: fix print_rate for ludicrous speeds 

The for loop should only probe up to G[i]bit rates, so that we
end up with T[i]bit as the last max units[] slot for snprintf(3),
and not possibly an invalid pointer in case rate is multiple of
kilo.

Fixes: 8cecdc2837 ("tc: more user friendly rates")
Reported-by: Jose R. Guzman Mosqueda <jose.r.guzman.mosqueda@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Daniel Borkmann 2015-05-29 21:47:45 +02:00 committed by Stephen Hemminger
parent 518af1e0b1
commit ad1fe0d8e9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tc/tc_util.c
View File

@ -250,18 +250,19 @@ void print_rate(char *buf, int len, __u64 rate)
extern int use_iec; extern int use_iec;
unsigned long kilo = use_iec ? 1024 : 1000; unsigned long kilo = use_iec ? 1024 : 1000;
const char *str = use_iec ? "i" : ""; const char *str = use_iec ? "i" : "";
int i = 0;
static char *units[5] = {"", "K", "M", "G", "T"}; static char *units[5] = {"", "K", "M", "G", "T"};
int i;
rate <<= 3; /* bytes/sec -> bits/sec */ rate <<= 3; /* bytes/sec -> bits/sec */
for (i = 0; i < ARRAY_SIZE(units); i++) { for (i = 0; i < ARRAY_SIZE(units) - 1; i++) {
if (rate < kilo) if (rate < kilo)
break; break;
if (((rate % kilo) != 0) && rate < 1000*kilo) if (((rate % kilo) != 0) && rate < 1000*kilo)
break; break;
rate /= kilo; rate /= kilo;
} }
snprintf(buf, len, "%.0f%s%sbit", (double)rate, units[i], str); snprintf(buf, len, "%.0f%s%sbit", (double)rate, units[i], str);
} }