Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 389f6612 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by David S. Miller
Browse files

[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: default avatarDaniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: default avatarBenjamin Thery <benjamin.thery@bull.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1cab3da6

include/net/addrconf.h

+2 −1
Original line number Diff line number Diff line
@@ -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,

net/ipv6/addrconf.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

net/ipv6/exthdrs.c

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
			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);