aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_input.c
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2016-07-06 20:15:34 -0400
committerJames Morris <james.l.morris@oracle.com>2016-07-06 20:15:34 -0400
commitd011a4d861ce583466a8ae72a0c8e7f51c8cba4e (patch)
tree1ff8dfe7d486f5648e69ee85e54cde1987d8296a /net/ipv4/tcp_input.c
parent544e1cea03e6674e3c12a3b8e8cc507c3dbeaf0c (diff)
parent3f09354ac84c6904787189d85fb306bf60f714b8 (diff)
Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r--net/ipv4/tcp_input.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index d6c8f4cd0800..d663d5071d26 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -6114,6 +6114,9 @@ struct request_sock *inet_reqsk_alloc(const struct request_sock_ops *ops,
6114 6114
6115 kmemcheck_annotate_bitfield(ireq, flags); 6115 kmemcheck_annotate_bitfield(ireq, flags);
6116 ireq->opt = NULL; 6116 ireq->opt = NULL;
6117#if IS_ENABLED(CONFIG_IPV6)
6118 ireq->pktopts = NULL;
6119#endif
6117 atomic64_set(&ireq->ir_cookie, 0); 6120 atomic64_set(&ireq->ir_cookie, 0);
6118 ireq->ireq_state = TCP_NEW_SYN_RECV; 6121 ireq->ireq_state = TCP_NEW_SYN_RECV;
6119 write_pnet(&ireq->ireq_net, sock_net(sk_listener)); 6122 write_pnet(&ireq->ireq_net, sock_net(sk_listener));