Commit 35cc3cef authored by Or Gerlitz's avatar Or Gerlitz Committed by David S. Miller

net/sched: cls_flower: Reject duplicated rules also under skip_sw

Currently, duplicated rules are rejected only for skip_hw or "none",
hence allowing users to push duplicates into HW for no reason.

Use the flower tables to protect for that.
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarPaul Blakey <paulb@mellanox.com>
Reported-by: default avatarChris Mi <chrism@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d4b60e94
...@@ -1238,18 +1238,16 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, ...@@ -1238,18 +1238,16 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
if (err) if (err)
goto errout_idr; goto errout_idr;
if (!tc_skip_sw(fnew->flags)) { if (!fold && fl_lookup(fnew->mask, &fnew->mkey)) {
if (!fold && fl_lookup(fnew->mask, &fnew->mkey)) { err = -EEXIST;
err = -EEXIST; goto errout_mask;
goto errout_mask;
}
err = rhashtable_insert_fast(&fnew->mask->ht, &fnew->ht_node,
fnew->mask->filter_ht_params);
if (err)
goto errout_mask;
} }
err = rhashtable_insert_fast(&fnew->mask->ht, &fnew->ht_node,
fnew->mask->filter_ht_params);
if (err)
goto errout_mask;
if (!tc_skip_hw(fnew->flags)) { if (!tc_skip_hw(fnew->flags)) {
err = fl_hw_replace_filter(tp, fnew, extack); err = fl_hw_replace_filter(tp, fnew, extack);
if (err) if (err)
...@@ -1303,9 +1301,8 @@ static int fl_delete(struct tcf_proto *tp, void *arg, bool *last, ...@@ -1303,9 +1301,8 @@ static int fl_delete(struct tcf_proto *tp, void *arg, bool *last,
struct cls_fl_head *head = rtnl_dereference(tp->root); struct cls_fl_head *head = rtnl_dereference(tp->root);
struct cls_fl_filter *f = arg; struct cls_fl_filter *f = arg;
if (!tc_skip_sw(f->flags)) rhashtable_remove_fast(&f->mask->ht, &f->ht_node,
rhashtable_remove_fast(&f->mask->ht, &f->ht_node, f->mask->filter_ht_params);
f->mask->filter_ht_params);
__fl_delete(tp, f, extack); __fl_delete(tp, f, extack);
*last = list_empty(&head->masks); *last = list_empty(&head->masks);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment