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

Commit 5d8c0aa9 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[INET]: Fix accidentally broken inet(6)_hash_connect's port offset calculations. 



The port offset calculations depend on the protocol family, but, as
Adrian noticed, I broke this logic with the commit

	5ee31fc1
	[INET]: Consolidate inet(6)_hash_connect.

Return this logic back, by passing the port offset directly into the
consolidated function.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Noticed-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2bfc79de

include/net/inet_hashtables.h

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static inline struct sock *inet_lookup(struct net *net, 
}



extern int __inet_hash_connect(struct inet_timewait_death_row *death_row,

		struct sock *sk,

		struct sock *sk, u32 port_offset,

		int (*check_established)(struct inet_timewait_death_row *,

			struct sock *, __u16, struct inet_timewait_sock **),

			       void (*hash)(struct sock *sk));

net/ipv4/inet_hashtables.c

+3 −3
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ void inet_unhash(struct sock *sk) 
EXPORT_SYMBOL_GPL(inet_unhash);



int __inet_hash_connect(struct inet_timewait_death_row *death_row,

		struct sock *sk,

		struct sock *sk, u32 port_offset,

		int (*check_established)(struct inet_timewait_death_row *,

			struct sock *, __u16, struct inet_timewait_sock **),

		void (*hash)(struct sock *sk))
@@ -413,7 +413,7 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row, 
	if (!snum) {

		int i, remaining, low, high, port;

		static u32 hint;

		u32 offset = hint + inet_sk_port_offset(sk);

		u32 offset = hint + port_offset;

		struct hlist_node *node;

		struct inet_timewait_sock *tw = NULL;
@@ -502,7 +502,7 @@ EXPORT_SYMBOL_GPL(__inet_hash_connect); 
int inet_hash_connect(struct inet_timewait_death_row *death_row,

		      struct sock *sk)

{

	return __inet_hash_connect(death_row, sk,

	return __inet_hash_connect(death_row, sk, inet_sk_port_offset(sk),

			__inet_check_established, __inet_hash_nolisten);

}

net/ipv6/inet6_hashtables.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static inline u32 inet6_sk_port_offset(const struct sock *sk) 
int inet6_hash_connect(struct inet_timewait_death_row *death_row,

		       struct sock *sk)

{

	return __inet_hash_connect(death_row, sk,

	return __inet_hash_connect(death_row, sk, inet6_sk_port_offset(sk),

			__inet6_check_established, __inet6_hash);

}