Commit e5fbfc1c authored Feb 22, 2016 by Craig Gallek Committed by David S. Miller Feb 24, 2016

soreuseport: fix merge conflict in tcp bind



One of the validation checks for the new array-based TCP SO_REUSEPORT
validation was unintentionally dropped in ea8add2b.  This adds it back.

Lack of this check allows the user to allocate multiple sock_reuseport
structures (leaking all but the first).

Fixes: ea8add2b ("tcp/dccp: better use of ephemeral ports in bind()")
Signed-off-by: Craig Gallek <kraig@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f5461c27

net/ipv4/inet_connection_sock.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -202,6 +202,7 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum)

	if (((tb->fastreuse > 0 && reuse) \|\|		if (((tb->fastreuse > 0 && reuse) \|\|
	(tb->fastreuseport > 0 &&		(tb->fastreuseport > 0 &&
			!rcu_access_pointer(sk->sk_reuseport_cb) &&
	sk->sk_reuseport && uid_eq(tb->fastuid, uid))) &&		sk->sk_reuseport && uid_eq(tb->fastuid, uid))) &&
	smallest_size == -1)		smallest_size == -1)
	goto success;		goto success;