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

Commit 8f491069 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[IPV4]: Use network-order dport for all visible inet_lookup_* 



Right now most inet_lookup_* functions take a host-order hnum instead
of a network-order dport because that's how it is represented
internally.

This means that users of these functions have to be careful about
using the right byte-order.  To add more confusion, inet_lookup takes
a network-order dport unlike all other functions.

So this patch changes all visible inet_lookup functions to take a
dport and move all dport->hnum conversion inside them.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 832b4c5e

include/net/inet_hashtables.h

+24 −7
Original line number Original line Diff line number Diff line
@@ -271,10 +271,16 @@ static inline int inet_iif(const struct sk_buff *skb) 
	return ((struct rtable *)skb->dst)->rt_iif;

	return ((struct rtable *)skb->dst)->rt_iif;

}

}





extern struct sock *

extern struct sock *__inet_lookup_listener(struct inet_hashinfo *hashinfo,

		inet_lookup_listener(struct inet_hashinfo *hashinfo,

					   const u32 daddr,

					   const u32 daddr,

				     const unsigned short hnum, const int dif);

					   const unsigned short hnum,

					   const int dif);



static inline struct sock *inet_lookup_listener(struct inet_hashinfo *hashinfo,

						u32 daddr, u16 dport, int dif)

{

	return __inet_lookup_listener(hashinfo, daddr, ntohs(dport), dif);

}





/* Socket demux engine toys. */

/* Socket demux engine toys. */

#ifdef __BIG_ENDIAN

#ifdef __BIG_ENDIAN
@@ -362,14 +368,25 @@ static inline struct sock * 
	goto out;

	goto out;

}

}





static inline struct sock *

	inet_lookup_established(struct inet_hashinfo *hashinfo,

				const u32 saddr, const u16 sport,

				const u32 daddr, const u16 dport,

				const int dif)

{

	return __inet_lookup_established(hashinfo, saddr, sport, daddr,

					 ntohs(dport), dif);

}



static inline struct sock *__inet_lookup(struct inet_hashinfo *hashinfo,

static inline struct sock *__inet_lookup(struct inet_hashinfo *hashinfo,

					 const u32 saddr, const u16 sport,

					 const u32 saddr, const u16 sport,

					 const u32 daddr, const u16 hnum,

					 const u32 daddr, const u16 dport,

					 const int dif)

					 const int dif)

{

{

	u16 hnum = ntohs(dport);

	struct sock *sk = __inet_lookup_established(hashinfo, saddr, sport, daddr,

	struct sock *sk = __inet_lookup_established(hashinfo, saddr, sport, daddr,

						    hnum, dif);

						    hnum, dif);

	return sk ? : inet_lookup_listener(hashinfo, daddr, hnum, dif);

	return sk ? : __inet_lookup_listener(hashinfo, daddr, hnum, dif);

}

}





static inline struct sock *inet_lookup(struct inet_hashinfo *hashinfo,

static inline struct sock *inet_lookup(struct inet_hashinfo *hashinfo,
@@ -380,7 +397,7 @@ static inline struct sock *inet_lookup(struct inet_hashinfo *hashinfo, 
	struct sock *sk;

	struct sock *sk;





	local_bh_disable();

	local_bh_disable();

	sk = __inet_lookup(hashinfo, saddr, sport, daddr, ntohs(dport), dif);

	sk = __inet_lookup(hashinfo, saddr, sport, daddr, dport, dif);

	local_bh_enable();

	local_bh_enable();





	return sk;

	return sk;

net/dccp/ipv4.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -608,9 +608,9 @@ static struct sock *dccp_v4_hnd_req(struct sock *sk, struct sk_buff *skb) 
	if (req != NULL)

	if (req != NULL)

		return dccp_check_req(sk, skb, req, prev);

		return dccp_check_req(sk, skb, req, prev);





	nsk = __inet_lookup_established(&dccp_hashinfo,

	nsk = inet_lookup_established(&dccp_hashinfo,

				      iph->saddr, dh->dccph_sport,

				      iph->saddr, dh->dccph_sport,

					iph->daddr, ntohs(dh->dccph_dport),

				      iph->daddr, dh->dccph_dport,

				      inet_iif(skb));

				      inet_iif(skb));

	if (nsk != NULL) {

	if (nsk != NULL) {

		if (nsk->sk_state != DCCP_TIME_WAIT) {

		if (nsk->sk_state != DCCP_TIME_WAIT) {
@@ -925,7 +925,7 @@ static int dccp_v4_rcv(struct sk_buff *skb) 
	 * 	Look up flow ID in table and get corresponding socket */

	 * 	Look up flow ID in table and get corresponding socket */

	sk = __inet_lookup(&dccp_hashinfo,

	sk = __inet_lookup(&dccp_hashinfo,

			   skb->nh.iph->saddr, dh->dccph_sport,

			   skb->nh.iph->saddr, dh->dccph_sport,

			   skb->nh.iph->daddr, ntohs(dh->dccph_dport),

			   skb->nh.iph->daddr, dh->dccph_dport,

			   inet_iif(skb));

			   inet_iif(skb));





	/* 

	/*

net/ipv4/inet_hashtables.c

+9 −9
Original line number Original line Diff line number Diff line
@@ -124,7 +124,7 @@ EXPORT_SYMBOL(inet_listen_wlock); 
 * remote address for the connection. So always assume those are both

 * remote address for the connection. So always assume those are both

 * wildcarded during the search since they can never be otherwise.

 * wildcarded during the search since they can never be otherwise.

 */

 */

static struct sock *__inet_lookup_listener(const struct hlist_head *head,

static struct sock *inet_lookup_listener_slow(const struct hlist_head *head,

					      const u32 daddr,

					      const u32 daddr,

					      const unsigned short hnum,

					      const unsigned short hnum,

					      const int dif)

					      const int dif)
@@ -162,7 +162,7 @@ static struct sock *__inet_lookup_listener(const struct hlist_head *head, 
}

}





/* Optimize the common listener case. */

/* Optimize the common listener case. */

struct sock *inet_lookup_listener(struct inet_hashinfo *hashinfo,

struct sock *__inet_lookup_listener(struct inet_hashinfo *hashinfo,

				    const u32 daddr, const unsigned short hnum,

				    const u32 daddr, const unsigned short hnum,

				    const int dif)

				    const int dif)

{

{
@@ -179,7 +179,7 @@ struct sock *inet_lookup_listener(struct inet_hashinfo *hashinfo, 
		    (sk->sk_family == PF_INET || !ipv6_only_sock(sk)) &&

		    (sk->sk_family == PF_INET || !ipv6_only_sock(sk)) &&

		    !sk->sk_bound_dev_if)

		    !sk->sk_bound_dev_if)

			goto sherry_cache;

			goto sherry_cache;

		sk = __inet_lookup_listener(head, daddr, hnum, dif);

		sk = inet_lookup_listener_slow(head, daddr, hnum, dif);

	}

	}

	if (sk) {

	if (sk) {

sherry_cache:

sherry_cache:
@@ -188,7 +188,7 @@ struct sock *inet_lookup_listener(struct inet_hashinfo *hashinfo, 
	read_unlock(&hashinfo->lhash_lock);

	read_unlock(&hashinfo->lhash_lock);

	return sk;

	return sk;

}

}

EXPORT_SYMBOL_GPL(inet_lookup_listener);

EXPORT_SYMBOL_GPL(__inet_lookup_listener);





/* called with local bh disabled */

/* called with local bh disabled */

static int __inet_check_established(struct inet_timewait_death_row *death_row,

static int __inet_check_established(struct inet_timewait_death_row *death_row,

net/ipv4/tcp_ipv4.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -951,9 +951,9 @@ static struct sock *tcp_v4_hnd_req(struct sock *sk, struct sk_buff *skb) 
	if (req)

	if (req)

		return tcp_check_req(sk, skb, req, prev);

		return tcp_check_req(sk, skb, req, prev);





	nsk = __inet_lookup_established(&tcp_hashinfo, skb->nh.iph->saddr,

	nsk = inet_lookup_established(&tcp_hashinfo, skb->nh.iph->saddr,

				      th->source, skb->nh.iph->daddr,

				      th->source, skb->nh.iph->daddr,

					ntohs(th->dest), inet_iif(skb));

				      th->dest, inet_iif(skb));





	if (nsk) {

	if (nsk) {

		if (nsk->sk_state != TCP_TIME_WAIT) {

		if (nsk->sk_state != TCP_TIME_WAIT) {
@@ -1090,7 +1090,7 @@ int tcp_v4_rcv(struct sk_buff *skb) 
	TCP_SKB_CB(skb)->sacked	 = 0;

	TCP_SKB_CB(skb)->sacked	 = 0;





	sk = __inet_lookup(&tcp_hashinfo, skb->nh.iph->saddr, th->source,

	sk = __inet_lookup(&tcp_hashinfo, skb->nh.iph->saddr, th->source,

			   skb->nh.iph->daddr, ntohs(th->dest),

			   skb->nh.iph->daddr, th->dest,

			   inet_iif(skb));

			   inet_iif(skb));





	if (!sk)

	if (!sk)
@@ -1168,7 +1168,7 @@ int tcp_v4_rcv(struct sk_buff *skb) 
	case TCP_TW_SYN: {

	case TCP_TW_SYN: {

		struct sock *sk2 = inet_lookup_listener(&tcp_hashinfo,

		struct sock *sk2 = inet_lookup_listener(&tcp_hashinfo,

							skb->nh.iph->daddr,

							skb->nh.iph->daddr,

							ntohs(th->dest),

							th->dest,

							inet_iif(skb));

							inet_iif(skb));

		if (sk2) {

		if (sk2) {

			inet_twsk_deschedule((struct inet_timewait_sock *)sk,

			inet_twsk_deschedule((struct inet_timewait_sock *)sk,