aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2014-12-02 12:00:34 -0500
committerDavid S. Miller <davem@davemloft.net>2014-12-08 20:53:40 -0500
commit6a659cd0616299e3444db701820b5a35ae054e0e (patch)
tree34129393ad452a498f2ed5d199a116a0a6a104c7 /net/sched
parent3fe6b49e2f8adc61fef9a22ecc0c3565f9ea468d (diff)
net_sched: cls_flow: remove faulty use of list_for_each_entry_rcu
rcu variant is not correct here. The code is called by updater (rtnl lock is held), not by reader (no rcu_read_lock is held). Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/cls_flow.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index 4ac515f2a6ce..a6057394a207 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -578,7 +578,7 @@ static unsigned long flow_get(struct tcf_proto *tp, u32 handle)
578 struct flow_head *head = rtnl_dereference(tp->root); 578 struct flow_head *head = rtnl_dereference(tp->root);
579 struct flow_filter *f; 579 struct flow_filter *f;
580 580
581 list_for_each_entry_rcu(f, &head->filters, list) 581 list_for_each_entry(f, &head->filters, list)
582 if (f->handle == handle) 582 if (f->handle == handle)
583 return (unsigned long)f; 583 return (unsigned long)f;
584 return 0; 584 return 0;
@@ -654,7 +654,7 @@ static void flow_walk(struct tcf_proto *tp, struct tcf_walker *arg)
654 struct flow_head *head = rtnl_dereference(tp->root); 654 struct flow_head *head = rtnl_dereference(tp->root);
655 struct flow_filter *f; 655 struct flow_filter *f;
656 656
657 list_for_each_entry_rcu(f, &head->filters, list) { 657 list_for_each_entry(f, &head->filters, list) {
658 if (arg->count < arg->skip) 658 if (arg->count < arg->skip)
659 goto skip; 659 goto skip;
660 if (arg->fn(tp, (unsigned long)f, arg) < 0) { 660 if (arg->fn(tp, (unsigned long)f, arg) < 0) {