diff options
author | Maciej Fijalkowski <maciej.fijalkowski@intel.com> | 2020-05-13 21:47:17 +0200 |
---|---|---|
committer | David Ahern <dsahern@gmail.com> | 2020-05-18 14:57:15 +0000 |
commit | 42796dcd36772f2a0116bf8a1e94fe43733c0716 (patch) | |
tree | 6012f02a76de51c423dfbbef61bf1323593df2d2 | |
parent | 7bd9188581aa8abd644d45a990529a92efe50255 (diff) | |
download | iproute2-42796dcd36772f2a0116bf8a1e94fe43733c0716.tar.gz |
tc: mqprio: reject queues count/offset pair count higher than num_tc
Provide a sanity check that will make sure whether queues count/offset
pair count will not exceed the actual number of TCs being created.
Example command that is invalid because there are 4 count/offset pairs
whereas num_tc is only 2.
# tc qdisc add dev enp96s0f0 root mqprio num_tc 2 map 0 0 0 0 1 1 1 1
queues 4@0 4@4 4@8 4@12 hw 1 mode channel
Store the parsed count/offset pair count onto a dedicated variable that
will be compared against opt.num_tc after all of the command line
arguments were parsed. Bail out if this count is higher than opt.num_tc
and let user know about it.
Drivers were swallowing such commands as they were iterating over
count/offset pairs where num_tc was used as a delimiter, so this is not
a big deal, but better catch such misconfiguration at the command line
argument parsing level.
Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
-rw-r--r-- | tc/q_mqprio.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tc/q_mqprio.c b/tc/q_mqprio.c index 0eb41308a..f26ba8d7b 100644 --- a/tc/q_mqprio.c +++ b/tc/q_mqprio.c @@ -48,6 +48,7 @@ static int mqprio_parse_opt(struct qdisc_util *qu, int argc, __u64 max_rate64[TC_QOPT_MAX_QUEUE] = {0}; __u16 shaper = TC_MQPRIO_SHAPER_DCB; __u16 mode = TC_MQPRIO_MODE_DCB; + int cnt_off_pairs = 0; struct rtattr *tail; __u32 flags = 0; @@ -94,6 +95,7 @@ static int mqprio_parse_opt(struct qdisc_util *qu, int argc, } free(tmp); idx++; + cnt_off_pairs++; } } else if (strcmp(*argv, "hw") == 0) { NEXT_ARG(); @@ -173,6 +175,12 @@ static int mqprio_parse_opt(struct qdisc_util *qu, int argc, argc--; argv++; } + if (cnt_off_pairs > opt.num_tc) { + fprintf(stderr, "queues count/offset pair count %d can not be higher than given num_tc %d\n", + cnt_off_pairs, opt.num_tc); + return -1; + } + tail = NLMSG_TAIL(n); addattr_l(n, 1024, TCA_OPTIONS, &opt, sizeof(opt)); |