diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-07-08 13:38:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-07-08 13:38:55 -0700 |
| commit | 26e0fd1ce2418b10713b569a195bdb679233066b (patch) | |
| tree | afe1e76e4285fe79d291726d55a466f7bdc69305 | |
| parent | a430a43d087545c96542ee64573237919109d370 (diff) | |
| download | talos-op-linux-26e0fd1ce2418b10713b569a195bdb679233066b.tar.gz talos-op-linux-26e0fd1ce2418b10713b569a195bdb679233066b.zip | |
[NET]: Fix IPv4/DECnet routing rule dumping
When more rules are present than fit in a single skb, the remaining
rules are incorrectly skipped.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/decnet/dn_rules.c | 3 | ||||
| -rw-r--r-- | net/ipv4/fib_rules.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c index 06e785fe5757..22f321d9bf9d 100644 --- a/net/decnet/dn_rules.c +++ b/net/decnet/dn_rules.c @@ -399,9 +399,10 @@ int dn_fib_dump_rules(struct sk_buff *skb, struct netlink_callback *cb) rcu_read_lock(); hlist_for_each_entry(r, node, &dn_fib_rules, r_hlist) { if (idx < s_idx) - continue; + goto next; if (dn_fib_fill_rule(skb, r, cb, NLM_F_MULTI) < 0) break; +next: idx++; } rcu_read_unlock(); diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c index 6c642d11d4ca..773b12ba4e3c 100644 --- a/net/ipv4/fib_rules.c +++ b/net/ipv4/fib_rules.c @@ -457,13 +457,13 @@ int inet_dump_rules(struct sk_buff *skb, struct netlink_callback *cb) rcu_read_lock(); hlist_for_each_entry(r, node, &fib_rules, hlist) { - if (idx < s_idx) - continue; + goto next; if (inet_fill_rule(skb, r, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq, RTM_NEWRULE, NLM_F_MULTI) < 0) break; +next: idx++; } rcu_read_unlock(); |
