[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>
This commit is contained in:
committed by
David S. Miller
parent
1cab3da6be
commit
389f661224
@@ -65,7 +65,8 @@ extern int ipv6_chk_addr(struct net *net,
|
|||||||
int strict);
|
int strict);
|
||||||
|
|
||||||
#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
|
#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
|
#endif
|
||||||
extern struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net,
|
extern struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net,
|
||||||
struct in6_addr *addr,
|
struct in6_addr *addr,
|
||||||
|
@@ -2883,13 +2883,15 @@ void if6_proc_exit(void)
|
|||||||
|
|
||||||
#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
|
#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
|
||||||
/* Check if address is a home address configured on any interface. */
|
/* 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;
|
int ret = 0;
|
||||||
struct inet6_ifaddr * ifp;
|
struct inet6_ifaddr * ifp;
|
||||||
u8 hash = ipv6_addr_hash(addr);
|
u8 hash = ipv6_addr_hash(addr);
|
||||||
read_lock_bh(&addrconf_hash_lock);
|
read_lock_bh(&addrconf_hash_lock);
|
||||||
for (ifp = inet6_addr_lst[hash]; ifp; ifp = ifp->lst_next) {
|
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 &&
|
if (ipv6_addr_cmp(&ifp->addr, addr) == 0 &&
|
||||||
(ifp->flags & IFA_F_HOMEADDRESS)) {
|
(ifp->flags & IFA_F_HOMEADDRESS)) {
|
||||||
ret = 1;
|
ret = 1;
|
||||||
|
@@ -445,7 +445,7 @@ looped_back:
|
|||||||
kfree_skb(skb);
|
kfree_skb(skb);
|
||||||
return -1;
|
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),
|
IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),
|
||||||
IPSTATS_MIB_INADDRERRORS);
|
IPSTATS_MIB_INADDRERRORS);
|
||||||
kfree_skb(skb);
|
kfree_skb(skb);
|
||||||
|
Reference in New Issue
Block a user