diff options
| author | Daniel Lezcano <dlezcano@fr.ibm.com> | 2008-01-10 22:44:40 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:01:46 -0800 |
| commit | 389f661224cdbdf178553fb09a52dc6c8bf86890 (patch) | |
| tree | 710be1af4fd9a1173d9c6eae6da126872f9fd25c | |
| parent | 1cab3da6be6c7659f62d0d297b389cc0e48b2178 (diff) | |
[NETNS][IPV6]: inet6_addr - make ipv6_chk_home_addr namespace aware
Looks if the address is belonging to the network namespace, otherwise
discard the address for the check.
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/addrconf.h | 3 | ||||
| -rw-r--r-- | net/ipv6/addrconf.c | 4 | ||||
| -rw-r--r-- | net/ipv6/exthdrs.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h index 77f630f1280..8b1509bfc69 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h @@ -65,7 +65,8 @@ extern int ipv6_chk_addr(struct net *net, int strict); #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE) -extern int ipv6_chk_home_addr(struct in6_addr *addr); +extern int ipv6_chk_home_addr(struct net *net, + struct in6_addr *addr); #endif extern struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, struct in6_addr *addr, diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index c4df6cdff65..803caf1a389 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2883,13 +2883,15 @@ void if6_proc_exit(void) #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE) /* Check if address is a home address configured on any interface. */ -int ipv6_chk_home_addr(struct in6_addr *addr) +int ipv6_chk_home_addr(struct net *net, struct in6_addr *addr) { int ret = 0; struct inet6_ifaddr * ifp; u8 hash = ipv6_addr_hash(addr); read_lock_bh(&addrconf_hash_lock); for (ifp = inet6_addr_lst[hash]; ifp; ifp = ifp->lst_next) { + if (ifp->idev->dev->nd_net != net) + continue; if (ipv6_addr_cmp(&ifp->addr, addr) == 0 && (ifp->flags & IFA_F_HOMEADDRESS)) { ret = 1; diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c index 2df34ed276f..3cd1c993d52 100644 --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c @@ -445,7 +445,7 @@ looped_back: kfree_skb(skb); return -1; } - if (!ipv6_chk_home_addr(addr)) { + if (!ipv6_chk_home_addr(&init_net, addr)) { IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_INADDRERRORS); kfree_skb(skb); |