Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

net/sched/cls_flower.c

+10 −13
Original line number Diff line number Diff line
@@ -1238,7 +1238,6 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, 
	if (err)

		goto errout_idr;



	if (!tc_skip_sw(fnew->flags)) {

	if (!fold && fl_lookup(fnew->mask, &fnew->mkey)) {

		err = -EEXIST;

		goto errout_mask;
@@ -1248,7 +1247,6 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, 
				     fnew->mask->filter_ht_params);

	if (err)

		goto errout_mask;

	}



	if (!tc_skip_hw(fnew->flags)) {

		err = fl_hw_replace_filter(tp, fnew, extack);
@@ -1303,7 +1301,6 @@ static int fl_delete(struct tcf_proto *tp, void *arg, bool *last, 
	struct cls_fl_head *head = rtnl_dereference(tp->root);

	struct cls_fl_filter *f = arg;



	if (!tc_skip_sw(f->flags))

	rhashtable_remove_fast(&f->mask->ht, &f->ht_node,

			       f->mask->filter_ht_params);

	__fl_delete(tp, f, extack);