net/sched: simplify tcf_pedit_act

Remove the check for a negative number of keys as
this cannot ever happen

Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index 99154109427860c7476e69d0e1296f090b9d1811..c42fcc47dd6d946cd4bc5e5d59be79eedbae793e 100644 (file)
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -346,8 +346,12 @@ TC_INDIRECT_SCOPE int tcf_pedit_act(struct sk_buff *skb,
                                    const struct tc_action *a,
                                    struct tcf_result *res)
 {
+       enum pedit_header_type htype = TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK;
+       enum pedit_cmd cmd = TCA_PEDIT_KEY_EX_CMD_SET;
        struct tcf_pedit *p = to_pedit(a);
+       struct tcf_pedit_key_ex *tkey_ex;
        struct tcf_pedit_parms *parms;
+       struct tc_pedit_key *tkey;
        u32 max_offset;
        int i;
 
@@ -363,88 +367,81 @@ TC_INDIRECT_SCOPE int tcf_pedit_act(struct sk_buff *skb,
        tcf_lastuse_update(&p->tcf_tm);
        tcf_action_update_bstats(&p->common, skb);
 
-       if (parms->tcfp_nkeys > 0) {
-               struct tc_pedit_key *tkey = parms->tcfp_keys;
-               struct tcf_pedit_key_ex *tkey_ex = parms->tcfp_keys_ex;
-               enum pedit_header_type htype =
-                       TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK;
-               enum pedit_cmd cmd = TCA_PEDIT_KEY_EX_CMD_SET;
-
-               for (i = parms->tcfp_nkeys; i > 0; i--, tkey++) {
-                       u32 *ptr, hdata;
-                       int offset = tkey->off;
-                       int hoffset;
-                       u32 val;
-                       int rc;
-
-                       if (tkey_ex) {
-                               htype = tkey_ex->htype;
-                               cmd = tkey_ex->cmd;
-
-                               tkey_ex++;
-                       }
+       tkey = parms->tcfp_keys;
+       tkey_ex = parms->tcfp_keys_ex;
 
-                       rc = pedit_skb_hdr_offset(skb, htype, &hoffset);
-                       if (rc) {
-                               pr_info("tc action pedit bad header type specified (0x%x)\n",
-                                       htype);
-                               goto bad;
-                       }
+       for (i = parms->tcfp_nkeys; i > 0; i--, tkey++) {
+               int offset = tkey->off;
+               u32 *ptr, hdata;
+               int hoffset;
+               u32 val;
+               int rc;
 
-                       if (tkey->offmask) {
-                               u8 *d, _d;
-
-                               if (!offset_valid(skb, hoffset + tkey->at)) {
-                                       pr_info("tc action pedit 'at' offset %d out of bounds\n",
-                                               hoffset + tkey->at);
-                                       goto bad;
-                               }
-                               d = skb_header_pointer(skb, hoffset + tkey->at,
-                                                      sizeof(_d), &_d);
-                               if (!d)
-                                       goto bad;
-                               offset += (*d & tkey->offmask) >> tkey->shift;
-                       }
+               if (tkey_ex) {
+                       htype = tkey_ex->htype;
+                       cmd = tkey_ex->cmd;
 
-                       if (offset % 4) {
-                               pr_info("tc action pedit offset must be on 32 bit boundaries\n");
-                               goto bad;
-                       }
+                       tkey_ex++;
+               }
 
-                       if (!offset_valid(skb, hoffset + offset)) {
-                               pr_info("tc action pedit offset %d out of bounds\n",
-                                       hoffset + offset);
-                               goto bad;
-                       }
+               rc = pedit_skb_hdr_offset(skb, htype, &hoffset);
+               if (rc) {
+                       pr_info("tc action pedit bad header type specified (0x%x)\n",
+                               htype);
+                       goto bad;
+               }
 
-                       ptr = skb_header_pointer(skb, hoffset + offset,
-                                                sizeof(hdata), &hdata);
-                       if (!ptr)
-                               goto bad;
-                       /* just do it, baby */
-                       switch (cmd) {
-                       case TCA_PEDIT_KEY_EX_CMD_SET:
-                               val = tkey->val;
-                               break;
-                       case TCA_PEDIT_KEY_EX_CMD_ADD:
-                               val = (*ptr + tkey->val) & ~tkey->mask;
-                               break;
-                       default:
-                               pr_info("tc action pedit bad command (%d)\n",
-                                       cmd);
+               if (tkey->offmask) {
+                       u8 *d, _d;
+
+                       if (!offset_valid(skb, hoffset + tkey->at)) {
+                               pr_info("tc action pedit 'at' offset %d out of bounds\n",
+                                       hoffset + tkey->at);
                                goto bad;
                        }
+                       d = skb_header_pointer(skb, hoffset + tkey->at,
+                                              sizeof(_d), &_d);
+                       if (!d)
+                               goto bad;
+                       offset += (*d & tkey->offmask) >> tkey->shift;
+               }
 
-                       *ptr = ((*ptr & tkey->mask) ^ val);
-                       if (ptr == &hdata)
-                               skb_store_bits(skb, hoffset + offset, ptr, 4);
+               if (offset % 4) {
+                       pr_info("tc action pedit offset must be on 32 bit boundaries\n");
+                       goto bad;
                }
 
-               goto done;
-       } else {
-               WARN(1, "pedit BUG: index %d\n", p->tcf_index);
+               if (!offset_valid(skb, hoffset + offset)) {
+                       pr_info("tc action pedit offset %d out of bounds\n",
+                               hoffset + offset);
+                       goto bad;
+               }
+
+               ptr = skb_header_pointer(skb, hoffset + offset,
+                                        sizeof(hdata), &hdata);
+               if (!ptr)
+                       goto bad;
+               /* just do it, baby */
+               switch (cmd) {
+               case TCA_PEDIT_KEY_EX_CMD_SET:
+                       val = tkey->val;
+                       break;
+               case TCA_PEDIT_KEY_EX_CMD_ADD:
+                       val = (*ptr + tkey->val) & ~tkey->mask;
+                       break;
+               default:
+                       pr_info("tc action pedit bad command (%d)\n",
+                               cmd);
+                       goto bad;
+               }
+
+               *ptr = ((*ptr & tkey->mask) ^ val);
+               if (ptr == &hdata)
+                       skb_store_bits(skb, hoffset + offset, ptr, 4);
        }
 
+       goto done;
+
 bad:
        spin_lock(&p->tcf_lock);
        p->tcf_qstats.overlimits++;