Commit b8d19572 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

netfilter: use in_dev_for_each_ifa_rcu 



Netfilter hooks are always running under rcu read lock, use
the new iterator macro so sparse won't complain once we add
proper __rcu annotations.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d519e870

net/ipv4/netfilter/nf_tproxy_ipv4.c

+7 −2
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ EXPORT_SYMBOL_GPL(nf_tproxy_handle_time_wait4); 


__be32 nf_tproxy_laddr4(struct sk_buff *skb, __be32 user_laddr, __be32 daddr)

{

	const struct in_ifaddr *ifa;

	struct in_device *indev;

	__be32 laddr;
@@ -61,10 +62,14 @@ __be32 nf_tproxy_laddr4(struct sk_buff *skb, __be32 user_laddr, __be32 daddr) 


	laddr = 0;

	indev = __in_dev_get_rcu(skb->dev);

	for_primary_ifa(indev) {



	in_dev_for_each_ifa_rcu(ifa, indev) {

		if (ifa->ifa_flags & IFA_F_SECONDARY)

			continue;



		laddr = ifa->ifa_local;

		break;

	} endfor_ifa(indev);

	}



	return laddr ? laddr : daddr;

}

net/netfilter/nf_conntrack_broadcast.c

+7 −2
Original line number Diff line number Diff line
@@ -41,12 +41,17 @@ int nf_conntrack_broadcast_help(struct sk_buff *skb, 


	in_dev = __in_dev_get_rcu(rt->dst.dev);

	if (in_dev != NULL) {

		for_primary_ifa(in_dev) {

		const struct in_ifaddr *ifa;



		in_dev_for_each_ifa_rcu(ifa, in_dev) {

			if (ifa->ifa_flags & IFA_F_SECONDARY)

				continue;



			if (ifa->ifa_broadcast == iph->daddr) {

				mask = ifa->ifa_mask;

				break;

			}

		} endfor_ifa(in_dev);

		}

	}



	if (mask == 0)

net/netfilter/nfnetlink_osf.c

+2 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ static inline int nf_osf_ttl(const struct sk_buff *skb, 
{

	struct in_device *in_dev = __in_dev_get_rcu(skb->dev);

	const struct iphdr *ip = ip_hdr(skb);

	const struct in_ifaddr *ifa;

	int ret = 0;



	if (ttl_check == NF_OSF_TTL_TRUE)
@@ -42,15 +43,13 @@ static inline int nf_osf_ttl(const struct sk_buff *skb, 
	else if (ip->ttl <= f_ttl)

		return 1;



	for_ifa(in_dev) {

	in_dev_for_each_ifa_rcu(ifa, in_dev) {

		if (inet_ifa_match(ip->saddr, ifa)) {

			ret = (ip->ttl == f_ttl);

			break;

		}

	}



	endfor_ifa(in_dev);



	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE