soreuseport: fix merge conflict in tcp bind
One of the validation checks for the new array-based TCP SO_REUSEPORT validation was unintentionally dropped insteinar/wifi_calib_4_9_kernelea8add2b19
. This adds it back. Lack of this check allows the user to allocate multiple sock_reuseport structures (leaking all but the first). Fixes:ea8add2b19
("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
f5461c2763
commit
e5fbfc1c2d
|
@ -202,6 +202,7 @@ tb_found:
|
||||||
|
|
||||||
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;
|
||||||
|
|
Loading…
Reference in New Issue