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

tc: avoid problems with hard coded rate string length 

The parse_percent_rate function assumed the buffer was 20 characters.
Better to pass length in case the size ever changes.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2019-02-06 10:49:47 -08:00
parent 2d603d55a8
commit 817204d0b0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tc/tc_util.c
View File

@ -190,7 +190,8 @@ static const struct rate_suffix {
{ NULL } { NULL }
}; };
static int parse_percent_rate(char *rate, const char *str, const char *dev) static int parse_percent_rate(char *rate, size_t len,
const char *str, const char *dev)
{ {
long dev_mbit; long dev_mbit;
int ret; int ret;
@ -221,8 +222,8 @@ static int parse_percent_rate(char *rate, const char *str, const char *dev)
rate_mbit = perc * dev_mbit; rate_mbit = perc * dev_mbit;
ret = snprintf(rate, 20, "%lf", rate_mbit); ret = snprintf(rate, len, "%lf", rate_mbit);
if (ret <= 0 || ret >= 20) { if (ret <= 0 || ret >= len) {
fprintf(stderr, "Unable to parse calculated rate\n"); fprintf(stderr, "Unable to parse calculated rate\n");
return -1; return -1;
} }
@ -239,7 +240,7 @@ int get_percent_rate(unsigned int *rate, const char *str, const char *dev)
{ {
char r_str[20]; char r_str[20];
if (parse_percent_rate(r_str, str, dev)) if (parse_percent_rate(r_str, sizeof(r_str), str, dev))
return -1; return -1;
return get_rate(rate, r_str); return get_rate(rate, r_str);
@ -249,7 +250,7 @@ int get_percent_rate64(__u64 *rate, const char *str, const char *dev)
{ {
char r_str[20]; char r_str[20];
if (parse_percent_rate(r_str, str, dev)) if (parse_percent_rate(r_str, sizeof(r_str), str, dev))
return -1; return -1;
return get_rate64(rate, r_str); return get_rate64(rate, r_str);