redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[IPV4]: fib_trie initialzation fix

Browse source 
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>
This commit is contained in:
Robert Olsson 2006-03-20 21:34:12 -08:00 committed by David S. Miller
parent 4f81c32b02
commit 5ddf0eb2bf
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
net/ipv4/fib_trie.c
View file

@ -50,7 +50,7 @@
* Patrick McHardy <kaber@trash.net> * Patrick McHardy <kaber@trash.net>
*/ */
#define VERSION "0.404" #define VERSION "0.405"
#include <linux/config.h> #include <linux/config.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
@ -2040,7 +2040,15 @@ rescan:
static struct node *fib_trie_get_first(struct fib_trie_iter *iter, static struct node *fib_trie_get_first(struct fib_trie_iter *iter,
struct trie *t) 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)) { if (n && IS_TNODE(n)) {
iter->tnode = (struct tnode *) n; iter->tnode = (struct tnode *) n;