diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-07-27 03:54:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-07-27 03:54:47 -0400 |
| commit | aa7eb8e78d8ecd6cd0475d86ea8385ff9cb47ece (patch) | |
| tree | 3f9e98fadd5124fb05e8f6f9b06aa23698d4f215 /net/core/fib_rules.c | |
| parent | cca8edfd2ec2a34d9f50f593bc753bb11e1bc1f5 (diff) | |
| parent | 3c6b50141ef9f0a8844bf1357b80c0cdf518bf05 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'net/core/fib_rules.c')
| -rw-r--r-- | net/core/fib_rules.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index 8248ebb5891d..008dc70b064b 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c | |||
| @@ -590,7 +590,8 @@ static int dump_rules(struct sk_buff *skb, struct netlink_callback *cb, | |||
| 590 | int idx = 0; | 590 | int idx = 0; |
| 591 | struct fib_rule *rule; | 591 | struct fib_rule *rule; |
| 592 | 592 | ||
| 593 | list_for_each_entry(rule, &ops->rules_list, list) { | 593 | rcu_read_lock(); |
| 594 | list_for_each_entry_rcu(rule, &ops->rules_list, list) { | ||
| 594 | if (idx < cb->args[1]) | 595 | if (idx < cb->args[1]) |
| 595 | goto skip; | 596 | goto skip; |
| 596 | 597 | ||
| @@ -601,6 +602,7 @@ static int dump_rules(struct sk_buff *skb, struct netlink_callback *cb, | |||
| 601 | skip: | 602 | skip: |
| 602 | idx++; | 603 | idx++; |
| 603 | } | 604 | } |
| 605 | rcu_read_unlock(); | ||
| 604 | cb->args[1] = idx; | 606 | cb->args[1] = idx; |
| 605 | rules_ops_put(ops); | 607 | rules_ops_put(ops); |
| 606 | 608 | ||
