diff options
author | Jiri Pirko <jiri@resnulli.us> | 2014-12-02 12:00:33 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-12-08 20:53:40 -0500 |
commit | 3fe6b49e2f8adc61fef9a22ecc0c3565f9ea468d (patch) | |
tree | 75c45bffe5dec3a81f238106c6c2beb8f03ed4b9 /net/sched | |
parent | 472f58370128d5e18f9d5429313a87d0f30af45e (diff) |
net_sched: cls_bpf: 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>
ACKed-by: Jamal Hadi Salim <jhs@mojatatu.com>
Acked-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r-- | net/sched/cls_bpf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c index cbfaf6f8feb3..d0de979c04a3 100644 --- a/net/sched/cls_bpf.c +++ b/net/sched/cls_bpf.c | |||
@@ -141,7 +141,7 @@ static unsigned long cls_bpf_get(struct tcf_proto *tp, u32 handle) | |||
141 | if (head == NULL) | 141 | if (head == NULL) |
142 | return 0UL; | 142 | return 0UL; |
143 | 143 | ||
144 | list_for_each_entry_rcu(prog, &head->plist, link) { | 144 | list_for_each_entry(prog, &head->plist, link) { |
145 | if (prog->handle == handle) { | 145 | if (prog->handle == handle) { |
146 | ret = (unsigned long) prog; | 146 | ret = (unsigned long) prog; |
147 | break; | 147 | break; |
@@ -337,7 +337,7 @@ static void cls_bpf_walk(struct tcf_proto *tp, struct tcf_walker *arg) | |||
337 | struct cls_bpf_head *head = rtnl_dereference(tp->root); | 337 | struct cls_bpf_head *head = rtnl_dereference(tp->root); |
338 | struct cls_bpf_prog *prog; | 338 | struct cls_bpf_prog *prog; |
339 | 339 | ||
340 | list_for_each_entry_rcu(prog, &head->plist, link) { | 340 | list_for_each_entry(prog, &head->plist, link) { |
341 | if (arg->count < arg->skip) | 341 | if (arg->count < arg->skip) |
342 | goto skip; | 342 | goto skip; |
343 | if (arg->fn(tp, (unsigned long) prog, arg) < 0) { | 343 | if (arg->fn(tp, (unsigned long) prog, arg) < 0) { |