12 files changed, 82 insertions, 0 deletions

diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index c8b7dc2c325..32b82705b68 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1771,6 +1771,9 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 case SIOCGSTAMP:
                         rc = sock_get_timestamp(sk, argp);
                         break;
+                case SIOCGSTAMPNS:
+                        rc = sock_get_timestampns(sk, argp);
+                        break;
                 /* Routing */
                 case SIOCADDRT:
                 case SIOCDELRT:
diff --git a/net/atm/ioctl.c b/net/atm/ioctl.c
index 8ccee4591f6..7afd8e7754f 100644
--- a/net/atm/ioctl.c
+++ b/net/atm/ioctl.c
@@ -82,6 +82,9 @@ int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 case SIOCGSTAMP: /* borrowed from IP */
                         error = sock_get_timestamp(sk, argp);
                         goto done;
+                case SIOCGSTAMPNS: /* borrowed from IP */
+                        error = sock_get_timestampns(sk, argp);
+                        goto done;
                 case ATM_SETSC:
                         printk(KERN_WARNING "ATM_SETSC is obsolete\n");
                         error = 0;
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 1c07c6a50eb..62605dc5a2c 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1711,6 +1711,10 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 res = sock_get_timestamp(sk, argp);
                 break;
 
+        case SIOCGSTAMPNS:
+                res = sock_get_timestampns(sk, argp);
+                break;
+
         case SIOCAX25ADDUID:    /* Add a uid to the uid/call map table */
         case SIOCAX25DELUID:    /* Delete a uid from the uid/call map table */
         case SIOCAX25GETUID: {
diff --git a/net/compat.c b/net/compat.c
index 17c2710b2b9..2fc6d9bb622 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -564,6 +564,30 @@ int compat_sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp)
 }
 EXPORT_SYMBOL(compat_sock_get_timestamp);
 
+int compat_sock_get_timestampns(struct sock *sk, struct timespec __user *userstamp)
+{
+        struct compat_timespec __user *ctv =
+                        (struct compat_timespec __user*) userstamp;
+        int err = -ENOENT;
+        struct timespec ts;
+
+        if (!sock_flag(sk, SOCK_TIMESTAMP))
+                sock_enable_timestamp(sk);
+        ts = ktime_to_timespec(sk->sk_stamp);
+        if (ts.tv_sec == -1)
+                return err;
+        if (ts.tv_sec == 0) {
+                sk->sk_stamp = ktime_get_real();
+                ts = ktime_to_timespec(sk->sk_stamp);
+        }
+        err = 0;
+        if (put_user(ts.tv_sec, &ctv->tv_sec) ||
+                        put_user(ts.tv_nsec, &ctv->tv_nsec))
+                err = -EFAULT;
+        return err;
+}
+EXPORT_SYMBOL(compat_sock_get_timestampns);
+
 asmlinkage long compat_sys_getsockopt(int fd, int level, int optname,
                                 char __user *optval, int __user *optlen)
 {
diff --git a/net/core/sock.c b/net/core/sock.c
index 6ddb3664b99..cb48fa0e124 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1567,6 +1567,22 @@ int sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp)
 }
 EXPORT_SYMBOL(sock_get_timestamp);
 
+int sock_get_timestampns(struct sock *sk, struct timespec __user *userstamp)
+{
+        struct timespec ts;
+        if (!sock_flag(sk, SOCK_TIMESTAMP))
+                sock_enable_timestamp(sk);
+        ts = ktime_to_timespec(sk->sk_stamp);
+        if (ts.tv_sec == -1)
+                return -ENOENT;
+        if (ts.tv_sec == 0) {
+                sk->sk_stamp = ktime_get_real();
+                ts = ktime_to_timespec(sk->sk_stamp);
+        }
+        return copy_to_user(userstamp, &ts, sizeof(ts)) ? -EFAULT : 0;
+}
+EXPORT_SYMBOL(sock_get_timestampns);
+
 void sock_enable_timestamp(struct sock *sk)
 {
         if (!sock_flag(sk, SOCK_TIMESTAMP)) {
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index f573eddc603..487f879f5a1 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -727,6 +727,9 @@ static int econet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg
                 case SIOCGSTAMP:
                         return sock_get_timestamp(sk, argp);
 
+                case SIOCGSTAMPNS:
+                        return sock_get_timestampns(sk, argp);
+
                 case SIOCSIFADDR:
                 case SIOCGIFADDR:
                         return ec_dev_ioctl(sock, cmd, argp);
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index cf358c84c44..df41856fc60 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -755,6 +755,9 @@ int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 case SIOCGSTAMP:
                         err = sock_get_timestamp(sk, (struct timeval __user *)arg);
                         break;
+                case SIOCGSTAMPNS:
+                        err = sock_get_timestampns(sk, (struct timespec __user *)arg);
+                        break;
                 case SIOCADDRT:
                 case SIOCDELRT:
                 case SIOCRTMSG:
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index fed3758181e..2ff07041795 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -443,6 +443,9 @@ int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
         case SIOCGSTAMP:
                 return sock_get_timestamp(sk, (struct timeval __user *)arg);
 
+        case SIOCGSTAMPNS:
+                return sock_get_timestampns(sk, (struct timespec __user *)arg);
+
         case SIOCADDRT:
         case SIOCDELRT:
 
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index bf9837dd95c..a54e7ef2568 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -1209,6 +1209,12 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 release_sock(sk);
                 return ret;
 
+        case SIOCGSTAMPNS:
+                lock_sock(sk);
+                ret = sock_get_timestampns(sk, argp);
+                release_sock(sk);
+                return ret;
+
         case SIOCGIFADDR:
         case SIOCSIFADDR:
         case SIOCGIFDSTADDR:
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index f9866a8456a..6f8c72d2413 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1545,6 +1545,8 @@ static int packet_ioctl(struct socket *sock, unsigned int cmd,
                 }
                 case SIOCGSTAMP:
                         return sock_get_timestamp(sk, (struct timeval __user *)arg);
+                case SIOCGSTAMPNS:
+                        return sock_get_timestampns(sk, (struct timespec __user *)arg);
 
 #ifdef CONFIG_INET
                 case SIOCADDRT:
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index f92d5310847..f64be9369ef 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1296,6 +1296,9 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
         case SIOCGSTAMP:
                 return sock_get_timestamp(sk, (struct timeval __user *) argp);
 
+        case SIOCGSTAMPNS:
+                return sock_get_timestampns(sk, (struct timespec __user *) argp);
+
         case SIOCGIFADDR:
         case SIOCSIFADDR:
         case SIOCGIFDSTADDR:
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index e62ba41b05c..a1988431562 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -1280,6 +1280,12 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                                 rc = sock_get_timestamp(sk,
                                                 (struct timeval __user *)argp);
                         break;
+                case SIOCGSTAMPNS:
+                        rc = -EINVAL;
+                        if (sk)
+                                rc = sock_get_timestampns(sk,
+                                                (struct timespec __user *)argp);
+                        break;
                 case SIOCGIFADDR:
                 case SIOCSIFADDR:
                 case SIOCGIFDSTADDR:
@@ -1521,6 +1527,12 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd,
                         rc = compat_sock_get_timestamp(sk,
                                         (struct timeval __user*)argp);
                 break;
+        case SIOCGSTAMPNS:
+                rc = -EINVAL;
+                if (sk)
+                        rc = compat_sock_get_timestampns(sk,
+                                        (struct timespec __user*)argp);
+                break;
         case SIOCGIFADDR:
         case SIOCSIFADDR:
         case SIOCGIFDSTADDR: