diff options
author | Eric Dumazet <edumazet@google.com> | 2015-03-12 19:44:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-12 22:58:13 -0400 |
commit | 3f66b083a5b7f1a63540c24df3679c24f2e935a9 (patch) | |
tree | 60b1b371c11729ed89d6f5bb3ac604eb72792892 /net/ipv6 | |
parent | d4f06873b636519cedbe8d2eeae77c713c6a121c (diff) |
inet: introduce ireq_family
Before inserting request socks into general hash table,
fill their socket family.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/syncookies.c | 1 | ||||
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c index 66bba6a84e47..58875ce8e178 100644 --- a/net/ipv6/syncookies.c +++ b/net/ipv6/syncookies.c | |||
@@ -197,6 +197,7 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb) | |||
197 | treq = tcp_rsk(req); | 197 | treq = tcp_rsk(req); |
198 | treq->listener = NULL; | 198 | treq->listener = NULL; |
199 | write_pnet(&ireq->ireq_net, sock_net(sk)); | 199 | write_pnet(&ireq->ireq_net, sock_net(sk)); |
200 | ireq->ireq_family = AF_INET6; | ||
200 | 201 | ||
201 | if (security_inet_conn_request(sk, skb, req)) | 202 | if (security_inet_conn_request(sk, skb, req)) |
202 | goto out_free; | 203 | goto out_free; |
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 1ccfede7d55f..c5fc6a5e4adc 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -749,6 +749,7 @@ static void tcp_v6_init_req(struct request_sock *req, struct sock *sk, | |||
749 | atomic_inc(&skb->users); | 749 | atomic_inc(&skb->users); |
750 | ireq->pktopts = skb; | 750 | ireq->pktopts = skb; |
751 | } | 751 | } |
752 | ireq->ireq_family = AF_INET6; | ||
752 | } | 753 | } |
753 | 754 | ||
754 | static struct dst_entry *tcp_v6_route_req(struct sock *sk, struct flowi *fl, | 755 | static struct dst_entry *tcp_v6_route_req(struct sock *sk, struct flowi *fl, |