1 files changed, 7 insertions, 6 deletions

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index e3dfddab21cc..d1dd95289b89 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -545,6 +545,7 @@ out:
 
 static void dccp_v4_reqsk_destructor(struct request_sock *req)
 {
+        dccp_feat_list_purge(&dccp_rsk(req)->dreq_featneg);
         kfree(inet_rsk(req)->opt);
 }
 
@@ -595,7 +596,8 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
         if (req == NULL)
                 goto drop;
 
-        dccp_reqsk_init(req, skb);
+        if (dccp_reqsk_init(req, dccp_sk(sk), skb))
+                goto drop_and_free;
 
         dreq = dccp_rsk(req);
         if (dccp_parse_options(sk, dreq, skb))
@@ -792,12 +794,10 @@ static int dccp_v4_rcv(struct sk_buff *skb)
         DCCP_SKB_CB(skb)->dccpd_seq  = dccp_hdr_seq(dh);
         DCCP_SKB_CB(skb)->dccpd_type = dh->dccph_type;
 
-        dccp_pr_debug("%8.8s "
-                      "src=%u.%u.%u.%u@%-5d "
-                      "dst=%u.%u.%u.%u@%-5d seq=%llu",
+        dccp_pr_debug("%8.8s src=%pI4@%-5d dst=%pI4@%-5d seq=%llu",
                       dccp_packet_name(dh->dccph_type),
-                      NIPQUAD(iph->saddr), ntohs(dh->dccph_sport),
-                      NIPQUAD(iph->daddr), ntohs(dh->dccph_dport),
+                      &iph->saddr, ntohs(dh->dccph_sport),
+                      &iph->daddr, ntohs(dh->dccph_dport),
                       (unsigned long long) DCCP_SKB_CB(skb)->dccpd_seq);
 
         if (dccp_packet_without_ack(skb)) {
@@ -938,6 +938,7 @@ static struct proto dccp_v4_prot = {
         .orphan_count           = &dccp_orphan_count,
         .max_header             = MAX_DCCP_HEADER,
         .obj_size               = sizeof(struct dccp_sock),
+        .slab_flags             = SLAB_DESTROY_BY_RCU,
         .rsk_prot               = &dccp_request_sock_ops,
         .twsk_prot              = &dccp_timewait_sock_ops,
         .h.hashinfo             = &dccp_hashinfo,