diff options
| author | Roland Dreier <roland@purestorage.com> | 2015-10-05 10:29:28 -0700 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-10-19 11:23:19 +0100 |
| commit | ca3f157b6651c783949debf37785c9a6219bd83d (patch) | |
| tree | 4dafb00d4424f6d9a952b8df91f6155b6e31c546 /net | |
| parent | 26fc260c0e11fc3df763d61d2b2dd856766a0860 (diff) | |
| download | linux-stable-ca3f157b6651c783949debf37785c9a6219bd83d.tar.gz linux-stable-ca3f157b6651c783949debf37785c9a6219bd83d.tar.bz2 linux-stable-ca3f157b6651c783949debf37785c9a6219bd83d.zip | |
fib_rules: Fix dump_rules() not to exit early
Backports of 41fc014332d9 ("fib_rules: fix fib rule dumps across
multiple skbs") introduced a regression in "ip rule show" - it ends up
dumping the first rule over and over and never exiting, because 3.19
and earlier are missing commit 053c095a82cf ("netlink: make
nlmsg_end() and genlmsg_end() void"), so fib_nl_fill_rule() ends up
returning skb->len (i.e. > 0) in the success case.
Fix this by checking the return code for < 0 instead of != 0.
Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/fib_rules.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index aeedc3a961a1..99ae718b79be 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -631,7 +631,7 @@ static int dump_rules(struct sk_buff *skb, struct netlink_callback *cb, err = fib_nl_fill_rule(skb, rule, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, RTM_NEWRULE, NLM_F_MULTI, ops); - if (err) + if (err < 0) break; skip: idx++; |