2 files changed, 49 insertions, 28 deletions

diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index b1d5da61f6af..027d1814e1ab 100644
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -117,11 +117,13 @@ struct sock *dccp_create_openreq_child(struct sock *sk,
                 struct dccp_sock *newdp = dccp_sk(newsk);
                 struct dccp_minisock *newdmsk = dccp_msk(newsk);
 
-                newdp->dccps_role          = DCCP_ROLE_SERVER;
-                newdp->dccps_hc_rx_ackvec  = NULL;
-                newdp->dccps_service_list  = NULL;
-                newdp->dccps_service       = dreq->dreq_service;
-                newicsk->icsk_rto          = DCCP_TIMEOUT_INIT;
+                newdp->dccps_role           = DCCP_ROLE_SERVER;
+                newdp->dccps_hc_rx_ackvec   = NULL;
+                newdp->dccps_service_list   = NULL;
+                newdp->dccps_service        = dreq->dreq_service;
+                newdp->dccps_timestamp_echo = dreq->dreq_timestamp_echo;
+                newdp->dccps_timestamp_time = dreq->dreq_timestamp_time;
+                newicsk->icsk_rto           = DCCP_TIMEOUT_INIT;
 
                 if (dccp_feat_clone(sk, newsk))
                         goto out_free;
@@ -303,9 +305,12 @@ EXPORT_SYMBOL_GPL(dccp_reqsk_send_ack);
 
 void dccp_reqsk_init(struct request_sock *req, struct sk_buff *skb)
 {
-        inet_rsk(req)->rmt_port = dccp_hdr(skb)->dccph_sport;
-        inet_rsk(req)->acked    = 0;
-        req->rcv_wnd            = sysctl_dccp_feat_sequence_window;
+        struct dccp_request_sock *dreq = dccp_rsk(req);
+
+        inet_rsk(req)->rmt_port   = dccp_hdr(skb)->dccph_sport;
+        inet_rsk(req)->acked      = 0;
+        req->rcv_wnd              = sysctl_dccp_feat_sequence_window;
+        dreq->dreq_timestamp_echo = 0;
 }
 
 EXPORT_SYMBOL_GPL(dccp_reqsk_init);
diff --git a/net/dccp/options.c b/net/dccp/options.c
index f496d4dc7efc..0c996d8c79a3 100644
--- a/net/dccp/options.c
+++ b/net/dccp/options.c
@@ -166,16 +166,27 @@ int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq,
                 case DCCPO_TIMESTAMP:
                         if (len != 4)
                                 goto out_invalid_option;
-
+                        /*
+                         * RFC 4340 13.1: "The precise time corresponding to
+                         * Timestamp Value zero is not specified". We use
+                         * zero to indicate absence of a meaningful timestamp.
+                         */
                         opt_val = get_unaligned((__be32 *)value);
-                        opt_recv->dccpor_timestamp = ntohl(opt_val);
-
-                        /* FIXME: if dreq != NULL, don't store this on listening socket */
-                        dp->dccps_timestamp_echo = opt_recv->dccpor_timestamp;
-                        dp->dccps_timestamp_time = ktime_get_real();
+                        if (unlikely(opt_val == 0)) {
+                                DCCP_WARN("Timestamp with zero value\n");
+                                break;
+                        }
 
+                        if (dreq != NULL) {
+                                dreq->dreq_timestamp_echo = ntohl(opt_val);
+                                dreq->dreq_timestamp_time = dccp_timestamp();
+                        } else {
+                                opt_recv->dccpor_timestamp =
+                                        dp->dccps_timestamp_echo = ntohl(opt_val);
+                                dp->dccps_timestamp_time = dccp_timestamp();
+                        }
                         dccp_pr_debug("%s rx opt: TIMESTAMP=%u, ackno=%llu\n",
-                                      dccp_role(sk), opt_recv->dccpor_timestamp,
+                                      dccp_role(sk), ntohl(opt_val),
                                       (unsigned long long)
                                       DCCP_SKB_CB(skb)->dccpd_ack_seq);
                         break;
@@ -393,16 +404,24 @@ int dccp_insert_option_timestamp(struct sock *sk, struct sk_buff *skb)
 
 EXPORT_SYMBOL_GPL(dccp_insert_option_timestamp);
 
-static int dccp_insert_option_timestamp_echo(struct sock *sk,
+static int dccp_insert_option_timestamp_echo(struct dccp_sock *dp,
+                                             struct dccp_request_sock *dreq,
                                              struct sk_buff *skb)
 {
-        struct dccp_sock *dp = dccp_sk(sk);
         __be32 tstamp_echo;
-        int len, elapsed_time_len;
         unsigned char *to;
-        const suseconds_t delta = ktime_us_delta(ktime_get_real(),
-                                                 dp->dccps_timestamp_time);
-        u32 elapsed_time = delta / 10;
+        u32 elapsed_time, elapsed_time_len, len;
+
+        if (dreq != NULL) {
+                elapsed_time = dccp_timestamp() - dreq->dreq_timestamp_time;
+                tstamp_echo  = htonl(dreq->dreq_timestamp_echo);
+                dreq->dreq_timestamp_echo = 0;
+        } else {
+                elapsed_time = dccp_timestamp() - dp->dccps_timestamp_time;
+                tstamp_echo  = htonl(dp->dccps_timestamp_echo);
+                dp->dccps_timestamp_echo = 0;
+        }
+
         elapsed_time_len = dccp_elapsed_time_len(elapsed_time);
         len = 6 + elapsed_time_len;
 
@@ -415,7 +434,6 @@ static int dccp_insert_option_timestamp_echo(struct sock *sk,
         *to++ = DCCPO_TIMESTAMP_ECHO;
         *to++ = len;
 
-        tstamp_echo = htonl(dp->dccps_timestamp_echo);
         memcpy(to, &tstamp_echo, 4);
         to += 4;
 
@@ -427,8 +445,6 @@ static int dccp_insert_option_timestamp_echo(struct sock *sk,
                 memcpy(to, &var32, 4);
         }
 
-        dp->dccps_timestamp_echo = 0;
-        dp->dccps_timestamp_time = ktime_set(0, 0);
         return 0;
 }
 
@@ -537,10 +553,6 @@ int dccp_insert_options(struct sock *sk, struct sk_buff *skb)
                     dccp_ackvec_pending(dp->dccps_hc_rx_ackvec) &&
                     dccp_insert_option_ackvec(sk, skb))
                         return -1;
-
-                if (dp->dccps_timestamp_echo != 0 &&
-                    dccp_insert_option_timestamp_echo(sk, skb))
-                        return -1;
         }
 
         if (dp->dccps_hc_rx_insert_options) {
@@ -564,6 +576,10 @@ int dccp_insert_options(struct sock *sk, struct sk_buff *skb)
             dccp_insert_option_timestamp(sk, skb))
                 return -1;
 
+        if (dp->dccps_timestamp_echo != 0 &&
+            dccp_insert_option_timestamp_echo(dp, NULL, skb))
+                return -1;
+
         /* XXX: insert other options when appropriate */
 
         if (DCCP_SKB_CB(skb)->dccpd_opt_len != 0) {