Commit d3734b04 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next 



Pablo Neira Ayuso says:

====================
The following patchset contains fixes for recently applied
Netfilter/IPVS updates to the net-next tree, most relevantly
they are:

* Fix sparse warnings introduced in the RCU conversion, from
  Julian Anastasov.

* Fix wrong endianness in the size field of IPVS sync messages,
  from Simon Horman.

* Fix missing if checking in nf_xfrm_me_harder, from Dan Carpenter.

* Fix off by one access in the IPVS SCTP tracking code, again from
  Dan Carpenter.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 204cd4f4 e7e6f630

include/net/ip_vs.h

+4 −4
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ struct ip_vs_service_user_kern { 
	u16			af;

	u16			protocol;

	union nf_inet_addr	addr;		/* virtual ip address */

	u16			port;

	__be16			port;

	u32			fwmark;		/* firwall mark of service */



	/* virtual service options */
@@ -686,14 +686,14 @@ struct ip_vs_service_user_kern { 
	char			*pe_name;

	unsigned int		flags;		/* virtual service flags */

	unsigned int		timeout;	/* persistent timeout in sec */

	u32			netmask;	/* persistent netmask */

	__be32			netmask;	/* persistent netmask or plen */

};





struct ip_vs_dest_user_kern {

	/* destination server address */

	union nf_inet_addr	addr;

	u16			port;

	__be16			port;



	/* real server options */

	unsigned int		conn_flags;	/* connection flags */
@@ -721,7 +721,7 @@ struct ip_vs_service { 
	__u32                   fwmark;   /* firewall mark of the service */

	unsigned int		flags;	  /* service status flags */

	unsigned int		timeout;  /* persistent timeout in ticks */

	__be32			netmask;  /* grouping granularity */

	__be32			netmask;  /* grouping granularity, mask/plen */

	struct net		*net;



	struct list_head	destinations;  /* real server d-linked list */

include/uapi/linux/ip_vs.h

+2 −2
Original line number Diff line number Diff line
@@ -280,8 +280,8 @@ struct ip_vs_daemon_user { 
#define IPVS_GENL_VERSION	0x1



struct ip_vs_flags {

	__be32 flags;

	__be32 mask;

	__u32 flags;

	__u32 mask;

};



/* Generic Netlink command attributes */

net/netfilter/ipvs/ip_vs_conn.c

+6 −8
Original line number Diff line number Diff line
@@ -966,7 +966,6 @@ static void *ip_vs_conn_array(struct seq_file *seq, loff_t pos) 
	struct ip_vs_iter_state *iter = seq->private;



	for (idx = 0; idx < ip_vs_conn_tab_size; idx++) {

		rcu_read_lock();

		hlist_for_each_entry_rcu(cp, &ip_vs_conn_tab[idx], c_list) {

			/* __ip_vs_conn_get() is not needed by

			 * ip_vs_conn_seq_show and ip_vs_conn_sync_seq_show
@@ -977,16 +976,19 @@ static void *ip_vs_conn_array(struct seq_file *seq, loff_t pos) 
			}

		}

		rcu_read_unlock();

		rcu_read_lock();

	}



	return NULL;

}



static void *ip_vs_conn_seq_start(struct seq_file *seq, loff_t *pos)

	__acquires(RCU)

{

	struct ip_vs_iter_state *iter = seq->private;



	iter->l = NULL;

	rcu_read_lock();

	return *pos ? ip_vs_conn_array(seq, *pos - 1) :SEQ_START_TOKEN;

}
@@ -1006,27 +1008,23 @@ static void *ip_vs_conn_seq_next(struct seq_file *seq, void *v, loff_t *pos) 
	e = rcu_dereference(hlist_next_rcu(&cp->c_list));

	if (e)

		return hlist_entry(e, struct ip_vs_conn, c_list);

	rcu_read_unlock();



	idx = l - ip_vs_conn_tab;

	while (++idx < ip_vs_conn_tab_size) {

		rcu_read_lock();

		hlist_for_each_entry_rcu(cp, &ip_vs_conn_tab[idx], c_list) {

			iter->l = &ip_vs_conn_tab[idx];

			return cp;

		}

		rcu_read_unlock();

		rcu_read_lock();

	}

	iter->l = NULL;

	return NULL;

}



static void ip_vs_conn_seq_stop(struct seq_file *seq, void *v)

	__releases(RCU)

{

	struct ip_vs_iter_state *iter = seq->private;

	struct hlist_head *l = iter->l;



	if (l)

	rcu_read_unlock();

}

net/netfilter/ipvs/ip_vs_core.c

+4 −3
Original line number Diff line number Diff line
@@ -235,7 +235,8 @@ ip_vs_sched_persist(struct ip_vs_service *svc, 
	/* Mask saddr with the netmask to adjust template granularity */

#ifdef CONFIG_IP_VS_IPV6

	if (svc->af == AF_INET6)

		ipv6_addr_prefix(&snet.in6, &iph->saddr.in6, svc->netmask);

		ipv6_addr_prefix(&snet.in6, &iph->saddr.in6,

				 (__force __u32) svc->netmask);

	else

#endif

		snet.ip = iph->saddr.ip & svc->netmask;
@@ -583,9 +584,9 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, 
#ifdef CONFIG_IP_VS_IPV6

	if (svc->af == AF_INET6) {

		if (!skb->dev) {

			struct net *net = dev_net(skb_dst(skb)->dev);

			struct net *net_ = dev_net(skb_dst(skb)->dev);



			skb->dev = net->loopback_dev;

			skb->dev = net_->loopback_dev;

		}

		icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);

	} else

net/netfilter/ipvs/ip_vs_ctl.c

+34 −21
Original line number Diff line number Diff line
@@ -1164,10 +1164,14 @@ ip_vs_add_service(struct net *net, struct ip_vs_service_user_kern *u, 
	}



#ifdef CONFIG_IP_VS_IPV6

	if (u->af == AF_INET6 && (u->netmask < 1 || u->netmask > 128)) {

	if (u->af == AF_INET6) {

		__u32 plen = (__force __u32) u->netmask;



		if (plen < 1 || plen > 128) {

			ret = -EINVAL;

			goto out_err;

		}

	}

#endif



	svc = kzalloc(sizeof(struct ip_vs_service), GFP_KERNEL);
@@ -1277,10 +1281,14 @@ ip_vs_edit_service(struct ip_vs_service *svc, struct ip_vs_service_user_kern *u) 
	}



#ifdef CONFIG_IP_VS_IPV6

	if (u->af == AF_INET6 && (u->netmask < 1 || u->netmask > 128)) {

	if (u->af == AF_INET6) {

		__u32 plen = (__force __u32) u->netmask;



		if (plen < 1 || plen > 128) {

			ret = -EINVAL;

			goto out;

		}

	}

#endif



	old_sched = rcu_dereference_protected(svc->scheduler, 1);
@@ -1460,8 +1468,11 @@ void ip_vs_service_net_cleanup(struct net *net) 
static inline void

ip_vs_forget_dev(struct ip_vs_dest *dest, struct net_device *dev)

{

	struct ip_vs_dest_dst *dest_dst;



	spin_lock_bh(&dest->dst_lock);

	if (dest->dest_dst && dest->dest_dst->dst_cache->dev == dev) {

	dest_dst = rcu_dereference_protected(dest->dest_dst, 1);

	if (dest_dst && dest_dst->dst_cache->dev == dev) {

		IP_VS_DBG_BUF(3, "Reset dev:%s dest %s:%u ,dest->refcnt=%d\n",

			      dev->name,

			      IP_VS_DBG_ADDR(dest->af, &dest->addr),
@@ -1934,8 +1945,8 @@ static struct ip_vs_service *ip_vs_info_array(struct seq_file *seq, loff_t pos) 
}



static void *ip_vs_info_seq_start(struct seq_file *seq, loff_t *pos)

	__acquires(RCU)

{



	rcu_read_lock();

	return *pos ? ip_vs_info_array(seq, *pos - 1) : SEQ_START_TOKEN;

}
@@ -1990,6 +2001,7 @@ static void *ip_vs_info_seq_next(struct seq_file *seq, void *v, loff_t *pos) 
}



static void ip_vs_info_seq_stop(struct seq_file *seq, void *v)

	__releases(RCU)

{

	rcu_read_unlock();

}
@@ -2134,7 +2146,7 @@ static int ip_vs_stats_percpu_show(struct seq_file *seq, void *v) 
{

	struct net *net = seq_file_single_net(seq);

	struct ip_vs_stats *tot_stats = &net_ipvs(net)->tot_stats;

	struct ip_vs_cpu_stats *cpustats = tot_stats->cpustats;

	struct ip_vs_cpu_stats __percpu *cpustats = tot_stats->cpustats;

	struct ip_vs_stats_user rates;

	int i;
@@ -2871,6 +2883,7 @@ static int ip_vs_genl_fill_service(struct sk_buff *skb, 
				   struct ip_vs_service *svc)

{

	struct ip_vs_scheduler *sched;

	struct ip_vs_pe *pe;

	struct nlattr *nl_service;

	struct ip_vs_flags flags = { .flags = svc->flags,

				     .mask = ~0 };
@@ -2887,17 +2900,17 @@ static int ip_vs_genl_fill_service(struct sk_buff *skb, 
	} else {

		if (nla_put_u16(skb, IPVS_SVC_ATTR_PROTOCOL, svc->protocol) ||

		    nla_put(skb, IPVS_SVC_ATTR_ADDR, sizeof(svc->addr), &svc->addr) ||

		    nla_put_u16(skb, IPVS_SVC_ATTR_PORT, svc->port))

		    nla_put_be16(skb, IPVS_SVC_ATTR_PORT, svc->port))

			goto nla_put_failure;

	}



	sched = rcu_dereference_protected(svc->scheduler, 1);

	pe = rcu_dereference_protected(svc->pe, 1);

	if (nla_put_string(skb, IPVS_SVC_ATTR_SCHED_NAME, sched->name) ||

	    (svc->pe &&

	     nla_put_string(skb, IPVS_SVC_ATTR_PE_NAME, svc->pe->name)) ||

	    (pe && nla_put_string(skb, IPVS_SVC_ATTR_PE_NAME, pe->name)) ||

	    nla_put(skb, IPVS_SVC_ATTR_FLAGS, sizeof(flags), &flags) ||

	    nla_put_u32(skb, IPVS_SVC_ATTR_TIMEOUT, svc->timeout / HZ) ||

	    nla_put_u32(skb, IPVS_SVC_ATTR_NETMASK, svc->netmask))

	    nla_put_be32(skb, IPVS_SVC_ATTR_NETMASK, svc->netmask))

		goto nla_put_failure;

	if (ip_vs_genl_fill_stats(skb, IPVS_SVC_ATTR_STATS, &svc->stats))

		goto nla_put_failure;
@@ -3010,7 +3023,7 @@ static int ip_vs_genl_parse_service(struct net *net, 
	} else {

		usvc->protocol = nla_get_u16(nla_protocol);

		nla_memcpy(&usvc->addr, nla_addr, sizeof(usvc->addr));

		usvc->port = nla_get_u16(nla_port);

		usvc->port = nla_get_be16(nla_port);

		usvc->fwmark = 0;

	}
@@ -3050,7 +3063,7 @@ static int ip_vs_genl_parse_service(struct net *net, 
		usvc->sched_name = nla_data(nla_sched);

		usvc->pe_name = nla_pe ? nla_data(nla_pe) : NULL;

		usvc->timeout = nla_get_u32(nla_timeout);

		usvc->netmask = nla_get_u32(nla_netmask);

		usvc->netmask = nla_get_be32(nla_netmask);

	}



	return 0;
@@ -3076,7 +3089,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest) 
		return -EMSGSIZE;



	if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||

	    nla_put_u16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||

	    nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||

	    nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,

			(atomic_read(&dest->conn_flags) &

			 IP_VS_CONN_F_FWD_MASK)) ||
@@ -3185,7 +3198,7 @@ static int ip_vs_genl_parse_dest(struct ip_vs_dest_user_kern *udest, 
	memset(udest, 0, sizeof(*udest));



	nla_memcpy(&udest->addr, nla_addr, sizeof(udest->addr));

	udest->port = nla_get_u16(nla_port);

	udest->port = nla_get_be16(nla_port);



	/* If a full entry was requested, check for the additional fields */

	if (full_entry) {
@@ -3210,8 +3223,8 @@ static int ip_vs_genl_parse_dest(struct ip_vs_dest_user_kern *udest, 
	return 0;

}



static int ip_vs_genl_fill_daemon(struct sk_buff *skb, __be32 state,

				  const char *mcast_ifn, __be32 syncid)

static int ip_vs_genl_fill_daemon(struct sk_buff *skb, __u32 state,

				  const char *mcast_ifn, __u32 syncid)

{

	struct nlattr *nl_daemon;
@@ -3232,8 +3245,8 @@ nla_put_failure: 
	return -EMSGSIZE;

}



static int ip_vs_genl_dump_daemon(struct sk_buff *skb, __be32 state,

				  const char *mcast_ifn, __be32 syncid,

static int ip_vs_genl_dump_daemon(struct sk_buff *skb, __u32 state,

				  const char *mcast_ifn, __u32 syncid,

				  struct netlink_callback *cb)

{

	void *hdr;

CRA Git | Maintained and supported by SUSTech CRA and CCSE