net_sched: fix memory leak in cls_tcindex

Fixes: commit 331b72922c5f58d48fd ("net: sched: RCU cls_tcindex")
Cc: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-By: John Fastabend <john.r.fastabend@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
index dd2d691f0bbb334f1c9e0450e982511b3ffa74ef..ee525426b3d4a445c23081a8fa9aa1e929bfdd8e 100644 (file)
--- a/net/sched/cls_tcindex.c
+++ b/net/sched/cls_tcindex.c
@@ -242,8 +242,10 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base,
         * perfect hash and hash pointers from old data.
         */
        cp = kzalloc(sizeof(*cp), GFP_KERNEL);
-       if (!cp)
-               return -ENOMEM;
+       if (!cp) {
+               err = -ENOMEM;
+               goto errout;
+       }
 
        cp->mask = p->mask;
        cp->shift = p->shift;
@@ -257,6 +259,7 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base,
                                      sizeof(*r) * cp->hash, GFP_KERNEL);
                if (!cp->perfect)
                        goto errout;
+               balloc = 1;
        }
        cp->h = p->h;
 
@@ -282,9 +285,9 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base,
        if (cp->perfect) {
                if (!valid_perfect_hash(cp) ||
                    cp->hash > cp->alloc_hash)
-                       goto errout;
+                       goto errout_alloc;
        } else if (cp->h && cp->hash != cp->alloc_hash) {
-               goto errout;
+               goto errout_alloc;
        }
 
        err = -EINVAL;
@@ -311,7 +314,7 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base,
         */
        if (cp->perfect || valid_perfect_hash(cp))
                if (handle >= cp->alloc_hash)
-                       goto errout;
+                       goto errout_alloc;
 
 
        err = -ENOMEM;
@@ -321,7 +324,7 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base,
 
                        cp->perfect = kcalloc(cp->hash, sizeof(*r), GFP_KERNEL);
                        if (!cp->perfect)
-                               goto errout;
+                               goto errout_alloc;
                        for (i = 0; i < cp->hash; i++)
                                tcf_exts_init(&cp->perfect[i].exts,
                                              TCA_TCINDEX_ACT,
@@ -335,7 +338,7 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base,
                                       GFP_KERNEL);
 
                        if (!hash)
-                               goto errout;
+                               goto errout_alloc;
 
                        cp->h = hash;
                        balloc = 2;