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

Commit 6b175b26 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

[NETNS]: Add netns parameter to inet_(dev_)add_type. 



The patch extends the inet_addr_type and inet_dev_addr_type with the
network namespace pointer. That allows to access the different tables
relatively to the network namespace.

The modification of the signature function is reported in all the
callers of the inet_addr_type using the pointer to the well known
init_net.

Acked-by: default avatarBenjamin Thery <benjamin.thery@bull.net>
Acked-by: default avatarDaniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ad4942c

drivers/s390/net/qeth_main.c

+1 −1
Original line number Diff line number Diff line
@@ -8340,7 +8340,7 @@ qeth_arp_constructor(struct neighbour *neigh) 
	neigh->parms = neigh_parms_clone(parms);

	rcu_read_unlock();



	neigh->type = inet_addr_type(*(__be32 *) neigh->primary_key);

	neigh->type = inet_addr_type(&init_net, *(__be32 *) neigh->primary_key);

	neigh->nud_state = NUD_NOARP;

	neigh->ops = arp_direct_ops;

	neigh->output = neigh->ops->queue_xmit;

include/net/route.h

+2 −2
Original line number Diff line number Diff line
@@ -117,8 +117,8 @@ extern int ip_route_input(struct sk_buff*, __be32 dst, __be32 src, u8 tos, stru 
extern unsigned short	ip_rt_frag_needed(struct iphdr *iph, unsigned short new_mtu);

extern void		ip_rt_send_redirect(struct sk_buff *skb);



extern unsigned		inet_addr_type(__be32 addr);

extern unsigned		inet_dev_addr_type(const struct net_device *dev, __be32 addr);

extern unsigned		inet_addr_type(struct net *net, __be32 addr);

extern unsigned		inet_dev_addr_type(struct net *net, const struct net_device *dev, __be32 addr);

extern void		ip_rt_multicast_event(struct in_device *);

extern int		ip_rt_ioctl(unsigned int cmd, void __user *arg);

extern void		ip_rt_get_source(u8 *src, struct rtable *rt);

net/atm/clip.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static int clip_constructor(struct neighbour *neigh) 
	struct neigh_parms *parms;



	pr_debug("clip_constructor (neigh %p, entry %p)\n", neigh, entry);

	neigh->type = inet_addr_type(entry->ip);

	neigh->type = inet_addr_type(&init_net, entry->ip);

	if (neigh->type != RTN_UNICAST)

		return -EINVAL;

net/ipv4/af_inet.c

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
	if (addr_len < sizeof(struct sockaddr_in))

		goto out;



	chk_addr_ret = inet_addr_type(addr->sin_addr.s_addr);

	chk_addr_ret = inet_addr_type(&init_net, addr->sin_addr.s_addr);



	/* Not specified by any standard per-se, however it breaks too

	 * many applications when removed.  It is unfortunate since

net/ipv4/arp.c

+6 −6
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static int arp_constructor(struct neighbour *neigh) 
	struct in_device *in_dev;

	struct neigh_parms *parms;



	neigh->type = inet_addr_type(addr);

	neigh->type = inet_addr_type(&init_net, addr);



	rcu_read_lock();

	in_dev = __in_dev_get_rcu(dev);
@@ -341,14 +341,14 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb) 
	switch (IN_DEV_ARP_ANNOUNCE(in_dev)) {

	default:

	case 0:		/* By default announce any local IP */

		if (skb && inet_addr_type(ip_hdr(skb)->saddr) == RTN_LOCAL)

		if (skb && inet_addr_type(&init_net, ip_hdr(skb)->saddr) == RTN_LOCAL)

			saddr = ip_hdr(skb)->saddr;

		break;

	case 1:		/* Restrict announcements of saddr in same subnet */

		if (!skb)

			break;

		saddr = ip_hdr(skb)->saddr;

		if (inet_addr_type(saddr) == RTN_LOCAL) {

		if (inet_addr_type(&init_net, saddr) == RTN_LOCAL) {

			/* saddr should be known to target */

			if (inet_addr_onlink(in_dev, target, saddr))

				break;
@@ -479,7 +479,7 @@ int arp_find(unsigned char *haddr, struct sk_buff *skb) 


	paddr = ((struct rtable*)skb->dst)->rt_gateway;



	if (arp_set_predefined(inet_addr_type(paddr), haddr, paddr, dev))

	if (arp_set_predefined(inet_addr_type(&init_net, paddr), haddr, paddr, dev))

		return 0;



	n = __neigh_lookup(&arp_tbl, &paddr, dev, 1);
@@ -806,7 +806,7 @@ static int arp_process(struct sk_buff *skb) 
	/* Special case: IPv4 duplicate address detection packet (RFC2131) */

	if (sip == 0) {

		if (arp->ar_op == htons(ARPOP_REQUEST) &&

		    inet_addr_type(tip) == RTN_LOCAL &&

		    inet_addr_type(&init_net, tip) == RTN_LOCAL &&

		    !arp_ignore(in_dev,dev,sip,tip))

			arp_send(ARPOP_REPLY, ETH_P_ARP, sip, dev, tip, sha,

				 dev->dev_addr, sha);
@@ -866,7 +866,7 @@ static int arp_process(struct sk_buff *skb) 
		 */

		if (n == NULL &&

		    arp->ar_op == htons(ARPOP_REPLY) &&

		    inet_addr_type(sip) == RTN_UNICAST)

		    inet_addr_type(&init_net, sip) == RTN_UNICAST)

			n = __neigh_lookup(&arp_tbl, &sip, dev, 1);

	}