diff options
| author | Jarek Poplawski <jarkao2@gmail.com> | 2009-06-30 12:47:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-30 12:48:38 -0700 |
| commit | 008440e3ad4b72f5048d1b1f6f5ed894fdc5ad08 (patch) | |
| tree | bcf7771cd07562b258aaa032f85c29eaa00b9b6c /net | |
| parent | 01e532981460594fffbf9b992ecfc96a78369924 (diff) | |
| download | op-kernel-dev-008440e3ad4b72f5048d1b1f6f5ed894fdc5ad08.zip op-kernel-dev-008440e3ad4b72f5048d1b1f6f5ed894fdc5ad08.tar.gz | |
ipv4: Fix fib_trie rebalancing, part 3
Alas current delaying of freeing old tnodes by RCU in trie_rebalance
is still not enough because we can free a top tnode before updating a
t->trie pointer.
Reported-by: Pawel Staszewski <pstaszewski@itcare.pl>
Tested-by: Pawel Staszewski <pstaszewski@itcare.pl>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/fib_trie.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 012cf5a..00a54b2 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -1021,6 +1021,9 @@ static void trie_rebalance(struct trie *t, struct tnode *tn) (struct node *)tn, wasfull); tp = node_parent((struct node *) tn); + if (!tp) + rcu_assign_pointer(t->trie, (struct node *)tn); + tnode_free_flush(); if (!tp) break; |
