diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-07-07 02:15:34 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-07-07 02:15:34 +0200 |
| commit | d011a4d861ce583466a8ae72a0c8e7f51c8cba4e (patch) | |
| tree | 1ff8dfe7d486f5648e69ee85e54cde1987d8296a /net/ipv4/tcp_input.c | |
| parent | ima: extend the measurement entry specific pcr (diff) | |
| parent | netlabel: Implement CALIPSO config functions for SMACK. (diff) | |
| download | linux-d011a4d861ce583466a8ae72a0c8e7f51c8cba4e.tar.xz linux-d011a4d861ce583466a8ae72a0c8e7f51c8cba4e.zip | |
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.c | 3 |
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, kmemcheck_annotate_bitfield(ireq, flags); ireq->opt = NULL; +#if IS_ENABLED(CONFIG_IPV6) + ireq->pktopts = NULL; +#endif atomic64_set(&ireq->ir_cookie, 0); ireq->ireq_state = TCP_NEW_SYN_RECV; write_pnet(&ireq->ireq_net, sock_net(sk_listener)); |