tc_util: detect overflow in get_size

[mirror_iproute2.git] / tc / m_csum.c

diff --git a/tc/m_csum.c b/tc/m_csum.c
index f7da6f0a25c0f21cc415be22cb98f7c985cde679..afbee9c8de0f9398623c79a1944d86ad11345cc4 100644 (file)
--- a/tc/m_csum.c
+++ b/tc/m_csum.c
@@ -24,8 +24,7 @@ explain(void)
 {
        fprintf(stderr, "Usage: ... csum <UPDATE>\n"
                        "Where: UPDATE := <TARGET> [<UPDATE>]\n"
-                       "       TARGET := { ip4h | icmp | igmp |"
-                               " tcp | udp | udplite | <SWEETS> }\n"
+                       "       TARGET := { ip4h | icmp | igmp | tcp | udp | udplite | sctp | <SWEETS> }\n"
                        "       SWEETS := { and | or | \'+\' }\n");
 }
 
@@ -45,7 +44,7 @@ parse_csum_args(int *argc_p, char ***argv_p, struct tc_csum *sel)
        if (argc <= 0)
                return -1;
 
-       while(argc > 0) {
+       while (argc > 0) {
                if ((matches(*argv, "iph") == 0) ||
                    (matches(*argv, "ip4h") == 0) ||
                    (matches(*argv, "ipv4h") == 0))
@@ -66,6 +65,9 @@ parse_csum_args(int *argc_p, char ***argv_p, struct tc_csum *sel)
                else if (matches(*argv, "udplite") == 0)
                        sel->update_flags |= TCA_CSUM_UPDATE_FLAG_UDPLITE;
 
+               else if (matches(*argv, "sctp") == 0)
+                       sel->update_flags |= TCA_CSUM_UPDATE_FLAG_SCTP;
+
                else if ((matches(*argv, "and") == 0) ||
                         (matches(*argv, "or") == 0) ||
                         (matches(*argv, "+") == 0))
@@ -86,15 +88,13 @@ static int
 parse_csum(struct action_util *a, int *argc_p,
           char ***argv_p, int tca_id, struct nlmsghdr *n)
 {
-       struct tc_csum sel;
+       struct tc_csum sel = {};
 
        int argc = *argc_p;
        char **argv = *argv_p;
        int ok = 0;
        struct rtattr *tail;
 
-       memset(&sel, 0, sizeof(sel));
-
        while (argc > 0) {
                if (matches(*argv, "csum") == 0) {
                        NEXT_ARG();
@@ -108,8 +108,7 @@ parse_csum(struct action_util *a, int *argc_p,
                        continue;
                } else if (matches(*argv, "help") == 0) {
                        usage();
-               }
-               else {
+               } else {
                        break;
                }
        }
@@ -124,30 +123,7 @@ parse_csum(struct action_util *a, int *argc_p,
                return -1;
        }
 
-       if (argc) {
-               if (matches(*argv, "reclassify") == 0) {
-                       sel.action = TC_ACT_RECLASSIFY;
-                       argc--;
-                       argv++;
-               } else if (matches(*argv, "pipe") == 0) {
-                       sel.action = TC_ACT_PIPE;
-                       argc--;
-                       argv++;
-               } else if (matches(*argv, "drop") == 0 ||
-                       matches(*argv, "shot") == 0) {
-                       sel.action = TC_ACT_SHOT;
-                       argc--;
-                       argv++;
-               } else if (matches(*argv, "continue") == 0) {
-                       sel.action = TC_ACT_UNSPEC;
-                       argc--;
-                       argv++;
-               } else if (matches(*argv, "pass") == 0) {
-                       sel.action = TC_ACT_OK;
-                       argc--;
-                       argv++;
-               }
-       }
+       parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_OK);
 
        if (argc) {
                if (matches(*argv, "index") == 0) {
@@ -162,10 +138,9 @@ parse_csum(struct action_util *a, int *argc_p,
                }
        }
 
-       tail = NLMSG_TAIL(n);
-       addattr_l(n, MAX_MSG, tca_id, NULL, 0);
+       tail = addattr_nest(n, MAX_MSG, tca_id);
        addattr_l(n, MAX_MSG, TCA_CSUM_PARMS, &sel, sizeof(sel));
-       tail->rta_len = (char *)NLMSG_TAIL(n) - (char *)tail;
+       addattr_nest_end(n, tail);
 
        *argc_p = argc;
        *argv_p = argv;
@@ -174,7 +149,7 @@ parse_csum(struct action_util *a, int *argc_p,
 }
 
 static int
-print_csum(struct action_util *au, FILE * f, struct rtattr *arg)
+print_csum(struct action_util *au, FILE *f, struct rtattr *arg)
 {
        struct tc_csum *sel;
 
@@ -186,7 +161,8 @@ print_csum(struct action_util *au, FILE * f, struct rtattr *arg)
        char *uflag_4 = "";
        char *uflag_5 = "";
        char *uflag_6 = "";
-       SPRINT_BUF(action_buf);
+       char *uflag_7 = "";
+       SPRINT_BUF(buf);
 
        int uflag_count = 0;
 
@@ -196,7 +172,7 @@ print_csum(struct action_util *au, FILE * f, struct rtattr *arg)
        parse_rtattr_nested(tb, TCA_CSUM_MAX, arg);
 
        if (tb[TCA_CSUM_PARMS] == NULL) {
-               fprintf(f, "[NULL csum parameters]");
+               fprintf(stderr, "Missing csum parameters\n");
                return -1;
        }
        sel = RTA_DATA(tb[TCA_CSUM_PARMS]);
@@ -212,29 +188,36 @@ print_csum(struct action_util *au, FILE * f, struct rtattr *arg)
                                        ", " flag_string : flag_string; \
                                uflag_count++;                          \
                        }                                               \
-               } while(0)
+               } while (0)
        CSUM_UFLAG_BUFFER(uflag_2, TCA_CSUM_UPDATE_FLAG_ICMP, "icmp");
        CSUM_UFLAG_BUFFER(uflag_3, TCA_CSUM_UPDATE_FLAG_IGMP, "igmp");
        CSUM_UFLAG_BUFFER(uflag_4, TCA_CSUM_UPDATE_FLAG_TCP, "tcp");
        CSUM_UFLAG_BUFFER(uflag_5, TCA_CSUM_UPDATE_FLAG_UDP, "udp");
        CSUM_UFLAG_BUFFER(uflag_6, TCA_CSUM_UPDATE_FLAG_UDPLITE, "udplite");
+       CSUM_UFLAG_BUFFER(uflag_7, TCA_CSUM_UPDATE_FLAG_SCTP, "sctp");
        if (!uflag_count) {
                uflag_1 = "?empty";
        }
 
-       fprintf(f, "csum (%s%s%s%s%s%s) action %s\n",
-               uflag_1, uflag_2, uflag_3,
-               uflag_4, uflag_5, uflag_6,
-               action_n2a(sel->action, action_buf, sizeof(action_buf)));
-       fprintf(f, "\tindex %d ref %d bind %d", sel->index, sel->refcnt, sel->bindcnt);
+       print_string(PRINT_ANY, "kind", "%s ", "csum");
+       snprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s",
+                uflag_1, uflag_2, uflag_3,
+                uflag_4, uflag_5, uflag_6, uflag_7);
+       print_string(PRINT_ANY, "csum", "(%s) ", buf);
+
+       print_action_control(f, "action ", sel->action, _SL_);
+       print_uint(PRINT_ANY, "index", "\tindex %u", sel->index);
+       print_int(PRINT_ANY, "ref", " ref %d", sel->refcnt);
+       print_int(PRINT_ANY, "bind", " bind %d", sel->bindcnt);
 
        if (show_stats) {
                if (tb[TCA_CSUM_TM]) {
                        struct tcf_t *tm = RTA_DATA(tb[TCA_CSUM_TM]);
-                       print_tm(f,tm);
+
+                       print_tm(f, tm);
                }
        }
-       fprintf(f, "\n");
+       print_nl();
 
        return 0;
 }