1 files changed, 32 insertions, 1 deletions

diff --git a/net/socket.c b/net/socket.c
index ea8f81abc45c..1ad62c08377b 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -585,6 +585,37 @@ int kernel_sendmsg(struct socket *sock, struct msghdr *msg,
         return result;
 }
 
+/*
+ * called from sock_recv_timestamp() if sock_flag(sk, SOCK_RCVTSTAMP)
+ */
+void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
+        struct sk_buff *skb)
+{
+        ktime_t kt = skb->tstamp;
+
+        if (!sock_flag(sk, SOCK_RCVTSTAMPNS)) {
+                struct timeval tv;
+                /* Race occurred between timestamp enabling and packet
+                   receiving.  Fill in the current time for now. */
+                if (kt.tv64 == 0)
+                        kt = ktime_get_real();
+                skb->tstamp = kt;
+                tv = ktime_to_timeval(kt);
+                put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMP, sizeof(tv), &tv);
+        } else {
+                struct timespec ts;
+                /* Race occurred between timestamp enabling and packet
+                   receiving.  Fill in the current time for now. */
+                if (kt.tv64 == 0)
+                        kt = ktime_get_real();
+                skb->tstamp = kt;
+                ts = ktime_to_timespec(kt);
+                put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMPNS, sizeof(ts), &ts);
+        }
+}
+
+EXPORT_SYMBOL_GPL(__sock_recv_timestamp);
+
 static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
                                  struct msghdr *msg, size_t size, int flags)
 {
@@ -1292,7 +1323,7 @@ asmlinkage long sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen)
         int err, fput_needed;
 
         sock = sockfd_lookup_light(fd, &err, &fput_needed);
-        if(sock) {
+        if (sock) {
                 err = move_addr_to_kernel(umyaddr, addrlen, address);
                 if (err >= 0) {
                         err = security_socket_bind(sock,