diff options
author | Cong Wang <cwang@twopensource.com> | 2014-04-25 16:54:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-04-27 23:42:39 -0400 |
commit | 2f7ef2f8790f5bf53db4fc6b2310943139285827 (patch) | |
tree | f2deb92bec03f3af01b9d7c1bf4dfb7b97760ecf /net/sched/cls_flow.c | |
parent | 4940b8cd1bc6d452eaffa442d92a28534850ca78 (diff) |
sched, cls: check if we could overwrite actions when changing a filter
When actions are attached to a filter, they are a part of the filter
itself, so when changing a filter we should allow to overwrite the actions
inside as well.
In my specific case, when I tried to _append_ a new action to an existing
filter which already has an action, I got EEXIST since kernel refused
to overwrite the existing one in kernel.
This patch checks if we are changing the filter checking NLM_F_CREATE flag
(Sigh, filters don't use NLM_F_REPLACE...) and then passes the boolean down
to actions. This fixes the problem above.
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>
Diffstat (limited to 'net/sched/cls_flow.c')
-rw-r--r-- | net/sched/cls_flow.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c index 257029c54332..35be16f7c192 100644 --- a/net/sched/cls_flow.c +++ b/net/sched/cls_flow.c | |||
@@ -349,7 +349,7 @@ static const struct nla_policy flow_policy[TCA_FLOW_MAX + 1] = { | |||
349 | static int flow_change(struct net *net, struct sk_buff *in_skb, | 349 | static int flow_change(struct net *net, struct sk_buff *in_skb, |
350 | struct tcf_proto *tp, unsigned long base, | 350 | struct tcf_proto *tp, unsigned long base, |
351 | u32 handle, struct nlattr **tca, | 351 | u32 handle, struct nlattr **tca, |
352 | unsigned long *arg) | 352 | unsigned long *arg, bool ovr) |
353 | { | 353 | { |
354 | struct flow_head *head = tp->root; | 354 | struct flow_head *head = tp->root; |
355 | struct flow_filter *f; | 355 | struct flow_filter *f; |
@@ -393,7 +393,7 @@ static int flow_change(struct net *net, struct sk_buff *in_skb, | |||
393 | } | 393 | } |
394 | 394 | ||
395 | tcf_exts_init(&e, TCA_FLOW_ACT, TCA_FLOW_POLICE); | 395 | tcf_exts_init(&e, TCA_FLOW_ACT, TCA_FLOW_POLICE); |
396 | err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &e); | 396 | err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &e, ovr); |
397 | if (err < 0) | 397 | if (err < 0) |
398 | return err; | 398 | return err; |
399 | 399 | ||