]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
net: cls_u32: fix missed pcpu_success free_percpu
authorJohn Fastabend <john.fastabend@gmail.com>
Sat, 20 Sep 2014 04:50:04 +0000 (21:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 22 Sep 2014 19:59:21 +0000 (15:59 -0400)
This fixes a missed free_percpu in the unwind code path and when
keys are destroyed.

Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/cls_u32.c

index 730edb29d43b53f364117684cefe5e499121508f..8d90e50a8ce401d42d7e7bf143cf65d9cc916584 100644 (file)
@@ -362,6 +362,9 @@ static int u32_destroy_key(struct tcf_proto *tp, struct tc_u_knode *n)
                n->ht_down->refcnt--;
 #ifdef CONFIG_CLS_U32_PERF
        free_percpu(n->pf);
+#endif
+#ifdef CONFIG_CLS_U32_MARK
+       free_percpu(n->pcpu_success);
 #endif
        kfree(n);
        return 0;
@@ -693,6 +696,10 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
 
 #ifdef CONFIG_CLS_U32_MARK
        n->pcpu_success = alloc_percpu(u32);
+       if (!n->pcpu_success) {
+               err = -ENOMEM;
+               goto errout;
+       }
 
        if (tb[TCA_U32_MARK]) {
                struct tc_u32_mark *mark;
@@ -720,6 +727,12 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
                *arg = (unsigned long)n;
                return 0;
        }
+
+#ifdef CONFIG_CLS_U32_MARK
+       free_percpu(n->pcpu_success);
+#endif
+
+errout:
 #ifdef CONFIG_CLS_U32_PERF
        free_percpu(n->pf);
 #endif