ipv6: add missing ireq_net & ir_cookie initializations

I forgot to update dccp_v6_conn_request() & cookie_v6_check().
They both need to set ireq->ireq_net and ireq->ir_cookie

Lets clear ireq->ir_cookie in inet_reqsk_alloc()

Signed-off-by: Eric Dumazet <edumazet@google.com>
Fixes: 33cf7c90fe2f ("net: add real socket cookies")
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index e565afd..30f7170 100644 (file)
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -249,6 +249,7 @@ static inline struct request_sock *inet_reqsk_alloc(struct request_sock_ops *ops
        if (req != NULL) {
                kmemcheck_annotate_bitfield(ireq, flags);
                ireq->opt = NULL;
+               atomic64_set(&ireq->ir_cookie, 0);
        }
 
        return req;

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index a78e0b9..f695874 100644 (file)
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -642,7 +642,6 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
        ireq->ir_loc_addr = ip_hdr(skb)->daddr;
        ireq->ir_rmt_addr = ip_hdr(skb)->saddr;
        write_pnet(&ireq->ireq_net, sock_net(sk));
-       atomic64_set(&ireq->ir_cookie, 0);
 
        /*
         * Step 3: Process LISTEN state

diff --cc net/dccp/ipv6.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv6/syncookies.c
Simple merge