tc: m_action: check cookie hex string len

[mirror_iproute2.git] / tc / q_mqprio.c

diff --git a/tc/q_mqprio.c b/tc/q_mqprio.c
index 207d6441d8fa35adb8c68dcde68b1ba270702c28..0eb41308a3fbc7ebbbf2bcb6558723c8cd74eb64 100644 (file)
--- a/tc/q_mqprio.c
+++ b/tc/q_mqprio.c
@@ -23,13 +23,14 @@
 
 static void explain(void)
 {
-       fprintf(stderr, "Usage: ... mqprio [num_tc NUMBER] [map P0 P1 ...]\n");
-       fprintf(stderr, "                  [queues count1@offset1 count2@offset2 ...] ");
-       fprintf(stderr, "[hw 1|0]\n");
-       fprintf(stderr, "                  [mode dcb|channel]\n");
-       fprintf(stderr, "                  [shaper bw_rlimit SHAPER_PARAMS]\n"
+       fprintf(stderr,
+               "Usage: ... mqprio      [num_tc NUMBER] [map P0 P1 ...]\n"
+               "                       [queues count1@offset1 count2@offset2 ...] "
+               "[hw 1|0]\n"
+               "                       [mode dcb|channel]\n"
+               "                       [shaper bw_rlimit SHAPER_PARAMS]\n"
                "Where: SHAPER_PARAMS := { min_rate MIN_RATE1 MIN_RATE2 ...|\n"
-               "                          max_rate MAX_RATE1 MAX_RATE2 ... }\n");
+               "                         max_rate MAX_RATE1 MAX_RATE2 ... }\n");
 }
 
 static int mqprio_parse_opt(struct qdisc_util *qu, int argc,
@@ -167,13 +168,13 @@ static int mqprio_parse_opt(struct qdisc_util *qu, int argc,
                        explain();
                        return -1;
                } else {
-                       fprintf(stderr, "Unknown argument\n");
-                       return -1;
+                       invarg("unknown argument", *argv);
                }
                argc--; argv++;
        }
 
-       tail = addattr_nest_compat(n, 1024, TCA_OPTIONS, &opt, sizeof(opt));
+       tail = NLMSG_TAIL(n);
+       addattr_l(n, 1024, TCA_OPTIONS, &opt, sizeof(opt));
 
        if (flags & TC_MQPRIO_F_MODE)
                addattr_l(n, 1024, TCA_MQPRIO_MODE,
@@ -208,7 +209,7 @@ static int mqprio_parse_opt(struct qdisc_util *qu, int argc,
                addattr_nest_end(n, start);
        }
 
-       addattr_nest_compat_end(n, tail);
+       tail->rta_len = (void *)NLMSG_TAIL(n) - (void *)tail;
 
        return 0;
 }