Skip to content

Commit

Permalink
[IPV4]: fib_trie initialzation fix
Browse files Browse the repository at this point in the history
In some kernel configs /proc functions seems to be accessed before the
trie is initialized. The patch below checks for this.

Signed-off-by: Robert Olsson <robert.olsson@its.uu.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Robert Olsson authored and David S. Miller committed Mar 21, 2006
1 parent 4f81c32 commit 5ddf0eb
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions net/ipv4/fib_trie.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
* Patrick McHardy <kaber@trash.net>
*/

#define VERSION "0.404"
#define VERSION "0.405"

#include <linux/config.h>
#include <asm/uaccess.h>
Expand Down Expand Up @@ -2040,7 +2040,15 @@ static struct node *fib_trie_get_next(struct fib_trie_iter *iter)
static struct node *fib_trie_get_first(struct fib_trie_iter *iter,
struct trie *t)
{
struct node *n = rcu_dereference(t->trie);
struct node *n ;

if(!t)
return NULL;

n = rcu_dereference(t->trie);

if(!iter)
return NULL;

if (n && IS_TNODE(n)) {
iter->tnode = (struct tnode *) n;
Expand Down

0 comments on commit 5ddf0eb

Please sign in to comment.