1 files changed, 9 insertions, 9 deletions

diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 9c6d0508e63a..4663a01d5039 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -668,7 +668,7 @@ static int dccp_v6_rcv(struct sk_buff *skb)
                 DCCP_SKB_CB(skb)->dccpd_ack_seq = dccp_hdr_ack_seq(skb);
 
 lookup:
-        sk = __inet6_lookup_skb(&dccp_hashinfo, skb,
+        sk = __inet6_lookup_skb(&dccp_hashinfo, skb, __dccp_hdr_len(dh),
                                 dh->dccph_sport, dh->dccph_dport,
                                 inet6_iif(skb));
         if (!sk) {
@@ -691,26 +691,26 @@ lookup:
 
         if (sk->sk_state == DCCP_NEW_SYN_RECV) {
                 struct request_sock *req = inet_reqsk(sk);
-                struct sock *nsk = NULL;
+                struct sock *nsk;
 
                 sk = req->rsk_listener;
-                if (likely(sk->sk_state == DCCP_LISTEN)) {
-                        nsk = dccp_check_req(sk, skb, req);
-                } else {
+                if (unlikely(sk->sk_state != DCCP_LISTEN)) {
                         inet_csk_reqsk_queue_drop_and_put(sk, req);
                         goto lookup;
                 }
+                sock_hold(sk);
+                nsk = dccp_check_req(sk, skb, req);
                 if (!nsk) {
                         reqsk_put(req);
-                        goto discard_it;
+                        goto discard_and_relse;
                 }
                 if (nsk == sk) {
-                        sock_hold(sk);
                         reqsk_put(req);
                 } else if (dccp_child_process(sk, nsk, skb)) {
                         dccp_v6_ctl_send_reset(sk, skb);
-                        goto discard_it;
+                        goto discard_and_relse;
                 } else {
+                        sock_put(sk);
                         return 0;
                 }
         }
@@ -993,7 +993,7 @@ static struct proto dccp_v6_prot = {
         .sendmsg           = dccp_sendmsg,
         .recvmsg           = dccp_recvmsg,
         .backlog_rcv       = dccp_v6_do_rcv,
-        .hash              = inet_hash,
+        .hash              = inet6_hash,
         .unhash            = inet_unhash,
         .accept            = inet_csk_accept,
         .get_port          = inet_csk_get_port,