diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2006-09-19 13:42:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-09-19 13:42:46 -0700 |
| commit | 888454c57a45511808d3fa52597b3d765df034a6 (patch) | |
| tree | eaae5d36c181b03944dd7ebd0748016313ce89d9 | |
| parent | b22b9004f22ba8ca33d15059e8b710a4b71ec3cc (diff) | |
| download | blackbird-op-linux-888454c57a45511808d3fa52597b3d765df034a6.tar.gz blackbird-op-linux-888454c57a45511808d3fa52597b3d765df034a6.zip | |
[IPV4] fib_trie: missing ntohl() when calling fib_semantic_match()
fib_trie.c::check_leaf() passes host-endian where fib_semantic_match()
expects (and stores into) net-endian.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/fib_trie.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 23fb9d9768e3..01801c0f885d 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -1281,18 +1281,18 @@ static inline int check_leaf(struct trie *t, struct leaf *l, struct fib_result *res) { int err, i; - t_key mask; + __be32 mask; struct leaf_info *li; struct hlist_head *hhead = &l->list; struct hlist_node *node; hlist_for_each_entry_rcu(li, node, hhead, hlist) { i = li->plen; - mask = ntohl(inet_make_mask(i)); - if (l->key != (key & mask)) + mask = inet_make_mask(i); + if (l->key != (key & ntohl(mask))) continue; - if ((err = fib_semantic_match(&li->falh, flp, res, l->key, mask, i)) <= 0) { + if ((err = fib_semantic_match(&li->falh, flp, res, htonl(l->key), mask, i)) <= 0) { *plen = i; #ifdef CONFIG_IP_FIB_TRIE_STATS t->stats.semantic_match_passed++; |
