tcp: move around a few calls in tcp_v6_conn_request
authorOctavian Purdila <octavian.purdila@intel.com>
Wed, 25 Jun 2014 14:09:56 +0000 (17:09 +0300)
committerDavid S. Miller <davem@davemloft.net>
Fri, 27 Jun 2014 22:53:36 +0000 (15:53 -0700)
commit9403715977075c89b1dbcdd7713ab542807a04ac
treef2d234693facf1b9b384d1752fb1e991fc43dfea
parentd94e0417ad8d96d7d96b69335338ad942eaeecf1
tcp: move around a few calls in tcp_v6_conn_request

Make the tcp_v6_conn_request calls flow similar with that of
tcp_v4_conn_request.

Note that want_cookie can be true only if isn is zero and that is why
we can move the if (want_cookie) block out of the if (!isn) block.

Moving security_inet_conn_request() has a couple of side effects:
missing inet_rsk(req)->ecn_ok update and the req->cookie_ts
update. However, neither SELinux nor Smack security hooks seems to
check them. This change should also avoid future different behaviour
for IPv4 and IPv6 in the security hooks.

Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/tcp_ipv6.c