1 files changed, 17 insertions, 13 deletions

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 4e9388bf104a..cab6b2f2f61d 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1844,22 +1844,22 @@ out:
 #endif
 
 static void tcp_update_recv_tstamps(struct sk_buff *skb,
-                                    struct scm_timestamping *tss)
+                                    struct scm_timestamping_internal *tss)
 {
         if (skb->tstamp)
-                tss->ts[0] = ktime_to_timespec(skb->tstamp);
+                tss->ts[0] = ktime_to_timespec64(skb->tstamp);
         else
-                tss->ts[0] = (struct timespec) {0};
+                tss->ts[0] = (struct timespec64) {0};
 
         if (skb_hwtstamps(skb)->hwtstamp)
-                tss->ts[2] = ktime_to_timespec(skb_hwtstamps(skb)->hwtstamp);
+                tss->ts[2] = ktime_to_timespec64(skb_hwtstamps(skb)->hwtstamp);
         else
-                tss->ts[2] = (struct timespec) {0};
+                tss->ts[2] = (struct timespec64) {0};
 }
 
 /* Similar to __sock_recv_timestamp, but does not require an skb */
 static void tcp_recv_timestamp(struct msghdr *msg, const struct sock *sk,
-                               struct scm_timestamping *tss)
+                               struct scm_timestamping_internal *tss)
 {
         int new_tstamp = sock_flag(sk, SOCK_TSTAMP_NEW);
         bool has_timestamping = false;
@@ -1873,8 +1873,10 @@ static void tcp_recv_timestamp(struct msghdr *msg, const struct sock *sk,
                                         put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMPNS_NEW,
                                                  sizeof(kts), &kts);
                                 } else {
+                                        struct timespec ts_old = timespec64_to_timespec(tss->ts[0]);
+
                                         put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMPNS_OLD,
-                                                 sizeof(tss->ts[0]), &tss->ts[0]);
+                                                 sizeof(ts_old), &ts_old);
                                 }
                         } else {
                                 if (new_tstamp) {
@@ -1898,20 +1900,22 @@ static void tcp_recv_timestamp(struct msghdr *msg, const struct sock *sk,
                 if (sk->sk_tsflags & SOF_TIMESTAMPING_SOFTWARE)
                         has_timestamping = true;
                 else
-                        tss->ts[0] = (struct timespec) {0};
+                        tss->ts[0] = (struct timespec64) {0};
         }
 
         if (tss->ts[2].tv_sec || tss->ts[2].tv_nsec) {
                 if (sk->sk_tsflags & SOF_TIMESTAMPING_RAW_HARDWARE)
                         has_timestamping = true;
                 else
-                        tss->ts[2] = (struct timespec) {0};
+                        tss->ts[2] = (struct timespec64) {0};
         }
 
         if (has_timestamping) {
-                tss->ts[1] = (struct timespec) {0};
-                put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMPING_OLD,
-                         sizeof(*tss), tss);
+                tss->ts[1] = (struct timespec64) {0};
+                if (sock_flag(sk, SOCK_TSTAMP_NEW))
+                        put_cmsg_scm_timestamping64(msg, tss);
+                else
+                        put_cmsg_scm_timestamping(msg, tss);
         }
 }
 
@@ -1952,7 +1956,7 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,
         long timeo;
         struct sk_buff *skb, *last;
         u32 urg_hole = 0;
-        struct scm_timestamping tss;
+        struct scm_timestamping_internal tss;
         bool has_tss = false;
         bool has_cmsg;