diff options
| author |   Stephen Hemminger <shemminger@vyatta.com> | 2008-02-11 21:12:49 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-02-12 17:53:30 -0800 |
| commit | ec28cf738d899e9d0652108e1986101771aacb2e (patch) | |
| tree | e848267fc6f9946075a0440be8b0a8ac6ef0c58a /net/ipv4/fib_trie.c | |
| parent | [IPV4]: Remove IP_TOS setting privilege checks. (diff) | |
| download | linux-dev-ec28cf738d899e9d0652108e1986101771aacb2e.tar.xz linux-dev-ec28cf738d899e9d0652108e1986101771aacb2e.zip | |
fib_trie: handle empty tree
This fixes possible problems when trie_firstleaf() returns NULL
to trie_leafindex().
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_trie.c')
| -rw-r--r-- | net/ipv4/fib_trie.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index f5fba3f71c06..2d895274b7f8 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -1762,11 +1762,9 @@ static struct leaf *trie_leafindex(struct trie *t, int index) { struct leaf *l = trie_firstleaf(t); - while (index-- > 0) { + while (l && index-- > 0) l = trie_nextleaf(l); - if (!l) - break; - } + return l; } |