1 files changed, 18 insertions, 6 deletions

diff --git a/net/socket.c b/net/socket.c
index ab624d42ead5..8d9d4fc7d962 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -1164,14 +1164,24 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 
                         err = open_related_ns(&net->ns, get_net_ns);
                         break;
-                case SIOCGSTAMP:
-                case SIOCGSTAMPNS:
+                case SIOCGSTAMP_OLD:
+                case SIOCGSTAMPNS_OLD:
                         if (!sock->ops->gettstamp) {
                                 err = -ENOIOCTLCMD;
                                 break;
                         }
                         err = sock->ops->gettstamp(sock, argp,
-                                                   cmd == SIOCGSTAMP, false);
+                                                   cmd == SIOCGSTAMP_OLD,
+                                                   !IS_ENABLED(CONFIG_64BIT));
+                case SIOCGSTAMP_NEW:
+                case SIOCGSTAMPNS_NEW:
+                        if (!sock->ops->gettstamp) {
+                                err = -ENOIOCTLCMD;
+                                break;
+                        }
+                        err = sock->ops->gettstamp(sock, argp,
+                                                   cmd == SIOCGSTAMP_NEW,
+                                                   false);
                         break;
                 default:
                         err = sock_do_ioctl(net, sock, cmd, arg);
@@ -3324,11 +3334,11 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
         case SIOCADDRT:
         case SIOCDELRT:
                 return routing_ioctl(net, sock, cmd, argp);
-        case SIOCGSTAMP:
-        case SIOCGSTAMPNS:
+        case SIOCGSTAMP_OLD:
+        case SIOCGSTAMPNS_OLD:
                 if (!sock->ops->gettstamp)
                         return -ENOIOCTLCMD;
-                return sock->ops->gettstamp(sock, argp, cmd == SIOCGSTAMP,
+                return sock->ops->gettstamp(sock, argp, cmd == SIOCGSTAMP_OLD,
                                             !COMPAT_USE_64BIT_TIME);
 
         case SIOCBONDSLAVEINFOQUERY:
@@ -3348,6 +3358,8 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
         case SIOCADDDLCI:
         case SIOCDELDLCI:
         case SIOCGSKNS:
+        case SIOCGSTAMP_NEW:
+        case SIOCGSTAMPNS_NEW:
                 return sock_ioctl(file, cmd, arg);
 
         case SIOCGIFFLAGS: