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

Merge branch 'net-sparse-warnings' 



Lance Richardson says:

====================
ipv4: fix various issues reported by sparse

This trivial patch series addresses a number of endianness- and
lock-related issues reported by sparse.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9b59377b ad64b8be

include/net/ip_fib.h

+2 −1
Original line number Diff line number Diff line
@@ -325,7 +325,8 @@ extern u32 fib_multipath_secret __read_mostly; 


static inline int fib_multipath_hash(__be32 saddr, __be32 daddr)

{

	return jhash_2words(saddr, daddr, fib_multipath_secret) >> 1;

	return jhash_2words((__force u32)saddr, (__force u32)daddr,

			    fib_multipath_secret) >> 1;

}



void fib_select_multipath(struct fib_result *res, int hash);

net/ipv4/ip_tunnel_core.c

+8 −8
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static int ip_tun_build_state(struct net_device *dev, struct nlattr *attr, 
	tun_info = lwt_tun_info(new_state);



	if (tb[LWTUNNEL_IP_ID])

		tun_info->key.tun_id = nla_get_u64(tb[LWTUNNEL_IP_ID]);

		tun_info->key.tun_id = nla_get_be64(tb[LWTUNNEL_IP_ID]);



	if (tb[LWTUNNEL_IP_DST])

		tun_info->key.u.ipv4.dst = nla_get_be32(tb[LWTUNNEL_IP_DST]);
@@ -266,7 +266,7 @@ static int ip_tun_build_state(struct net_device *dev, struct nlattr *attr, 
		tun_info->key.tos = nla_get_u8(tb[LWTUNNEL_IP_TOS]);



	if (tb[LWTUNNEL_IP_FLAGS])

		tun_info->key.tun_flags = nla_get_u16(tb[LWTUNNEL_IP_FLAGS]);

		tun_info->key.tun_flags = nla_get_be16(tb[LWTUNNEL_IP_FLAGS]);



	tun_info->mode = IP_TUNNEL_INFO_TX;

	tun_info->options_len = 0;
@@ -281,12 +281,12 @@ static int ip_tun_fill_encap_info(struct sk_buff *skb, 
{

	struct ip_tunnel_info *tun_info = lwt_tun_info(lwtstate);



	if (nla_put_u64(skb, LWTUNNEL_IP_ID, tun_info->key.tun_id) ||

	if (nla_put_be64(skb, LWTUNNEL_IP_ID, tun_info->key.tun_id) ||

	    nla_put_be32(skb, LWTUNNEL_IP_DST, tun_info->key.u.ipv4.dst) ||

	    nla_put_be32(skb, LWTUNNEL_IP_SRC, tun_info->key.u.ipv4.src) ||

	    nla_put_u8(skb, LWTUNNEL_IP_TOS, tun_info->key.tos) ||

	    nla_put_u8(skb, LWTUNNEL_IP_TTL, tun_info->key.ttl) ||

	    nla_put_u16(skb, LWTUNNEL_IP_FLAGS, tun_info->key.tun_flags))

	    nla_put_be16(skb, LWTUNNEL_IP_FLAGS, tun_info->key.tun_flags))

		return -ENOMEM;



	return 0;
@@ -346,7 +346,7 @@ static int ip6_tun_build_state(struct net_device *dev, struct nlattr *attr, 
	tun_info = lwt_tun_info(new_state);



	if (tb[LWTUNNEL_IP6_ID])

		tun_info->key.tun_id = nla_get_u64(tb[LWTUNNEL_IP6_ID]);

		tun_info->key.tun_id = nla_get_be64(tb[LWTUNNEL_IP6_ID]);



	if (tb[LWTUNNEL_IP6_DST])

		tun_info->key.u.ipv6.dst = nla_get_in6_addr(tb[LWTUNNEL_IP6_DST]);
@@ -361,7 +361,7 @@ static int ip6_tun_build_state(struct net_device *dev, struct nlattr *attr, 
		tun_info->key.tos = nla_get_u8(tb[LWTUNNEL_IP6_TC]);



	if (tb[LWTUNNEL_IP6_FLAGS])

		tun_info->key.tun_flags = nla_get_u16(tb[LWTUNNEL_IP6_FLAGS]);

		tun_info->key.tun_flags = nla_get_be16(tb[LWTUNNEL_IP6_FLAGS]);



	tun_info->mode = IP_TUNNEL_INFO_TX | IP_TUNNEL_INFO_IPV6;

	tun_info->options_len = 0;
@@ -376,12 +376,12 @@ static int ip6_tun_fill_encap_info(struct sk_buff *skb, 
{

	struct ip_tunnel_info *tun_info = lwt_tun_info(lwtstate);



	if (nla_put_u64(skb, LWTUNNEL_IP6_ID, tun_info->key.tun_id) ||

	if (nla_put_be64(skb, LWTUNNEL_IP6_ID, tun_info->key.tun_id) ||

	    nla_put_in6_addr(skb, LWTUNNEL_IP6_DST, &tun_info->key.u.ipv6.dst) ||

	    nla_put_in6_addr(skb, LWTUNNEL_IP6_SRC, &tun_info->key.u.ipv6.src) ||

	    nla_put_u8(skb, LWTUNNEL_IP6_HOPLIMIT, tun_info->key.tos) ||

	    nla_put_u8(skb, LWTUNNEL_IP6_TC, tun_info->key.ttl) ||

	    nla_put_u16(skb, LWTUNNEL_IP6_FLAGS, tun_info->key.tun_flags))

	    nla_put_be16(skb, LWTUNNEL_IP6_FLAGS, tun_info->key.tun_flags))

		return -ENOMEM;



	return 0;

net/ipv4/ping.c

+2 −0
Original line number Diff line number Diff line
@@ -1063,6 +1063,7 @@ static struct sock *ping_get_idx(struct seq_file *seq, loff_t pos) 
}



void *ping_seq_start(struct seq_file *seq, loff_t *pos, sa_family_t family)

	__acquires(ping_table.lock)

{

	struct ping_iter_state *state = seq->private;

	state->bucket = 0;
@@ -1094,6 +1095,7 @@ void *ping_seq_next(struct seq_file *seq, void *v, loff_t *pos) 
EXPORT_SYMBOL_GPL(ping_seq_next);



void ping_seq_stop(struct seq_file *seq, void *v)

	__releases(ping_table.lock)

{

	read_unlock_bh(&ping_table.lock);

}