[PATCH RFC net] net/sched: cls_flower: Reject duplicated rules also under skip_sw
From: Or Gerlitz <hidden>
Date: 2018-12-03 11:20:47
Subsystem:
networking [general], tc subsystem, the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Jamal Hadi Salim, Jiri Pirko, Linus Torvalds
Currently, duplicated rules are rejected only for skip_hw or "none", hence allowing users to push duplicated into HW for no reason. Use the flower tables to protect for that. Signed-off-by: Or Gerlitz <redacted> Signed-off-by: Paul Blakey <redacted> Reported-by: Chris Mi <redacted> --- net/sched/cls_flower.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index c6c327874abc..3868e5e73acf 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c@@ -1238,18 +1238,16 @@ 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; - } - - err = rhashtable_insert_fast(&fnew->mask->ht, &fnew->ht_node, - fnew->mask->filter_ht_params); - if (err) - goto errout_mask; + if (!fold && fl_lookup(fnew->mask, &fnew->mkey)) { + err = -EEXIST; + 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)) { err = fl_hw_replace_filter(tp, fnew, extack); if (err)
--
2.17.0.2884.g4ede3d4