diff options
| author | Cong Wang <cwang@twopensource.com> | 2014-07-16 14:25:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-17 14:58:52 -0700 |
| commit | 9cc63db5e1f2f1c387f1a4c9983cf1364fe4ef95 (patch) | |
| tree | da968fe917b63e42f40364ae5992f5e277559a55 | |
| parent | 4bbe3f5c7174e989989c04d41e6640ac0b944dac (diff) | |
| download | op-kernel-dev-9cc63db5e1f2f1c387f1a4c9983cf1364fe4ef95.zip op-kernel-dev-9cc63db5e1f2f1c387f1a4c9983cf1364fe4ef95.tar.gz | |
net_sched: cancel nest attribute on failure in tcf_exts_dump()
Like other places, we need to cancel the nest attribute after
we start. Fortunately the netlink message will not be sent on
failure, so it's not a big problem at all.
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/sched/cls_api.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 45527e6..c28b0d3 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -561,13 +561,14 @@ EXPORT_SYMBOL(tcf_exts_change); int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts) { #ifdef CONFIG_NET_CLS_ACT + struct nlattr *nest; + if (exts->action && !list_empty(&exts->actions)) { /* * again for backward compatible mode - we want * to work with both old and new modes of entering * tc data even if iproute2 was newer - jhs */ - struct nlattr *nest; if (exts->type != TCA_OLD_COMPAT) { nest = nla_nest_start(skb, exts->action); if (nest == NULL) @@ -585,10 +586,14 @@ int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts) nla_nest_end(skb, nest); } } -#endif return 0; -nla_put_failure: __attribute__ ((unused)) + +nla_put_failure: + nla_nest_cancel(skb, nest); return -1; +#else + return 0; +#endif } EXPORT_SYMBOL(tcf_exts_dump); |
