diff options
| author | John Fastabend <john.fastabend@gmail.com> | 2014-09-19 21:50:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-22 15:59:21 -0400 |
| commit | a1ddcfee2d9ae172d0095f3f8227f7fa53288c65 (patch) | |
| tree | 1403193490b5bb5373603ec13c0dd4a7c3944e56 /net/sched/cls_u32.c | |
| parent | 37ab7ddf3f81cec9175f53f17c357bb0d27a343e (diff) | |
| download | talos-obmc-linux-a1ddcfee2d9ae172d0095f3f8227f7fa53288c65.tar.gz talos-obmc-linux-a1ddcfee2d9ae172d0095f3f8227f7fa53288c65.zip | |
net: cls_u32: fix missed pcpu_success free_percpu
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>
Diffstat (limited to 'net/sched/cls_u32.c')
| -rw-r--r-- | net/sched/cls_u32.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c index 730edb29d43b..8d90e50a8ce4 100644 --- a/net/sched/cls_u32.c +++ b/net/sched/cls_u32.c @@ -363,6 +363,9 @@ static int u32_destroy_key(struct tcf_proto *tp, struct tc_u_knode *n) #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 |
