The SIOCGSTAMP/SIOCGSTAMPNS ioctl commands are implemented by many socket protocol handlers, and all of those end up calling the same sock_get_timestamp()/sock_get_timestampns() helper functions, which results in a lot of duplicate code. With the introduction of 64-bit time_t on 32-bit architectures, this gets worse, as we then need four different ioctl commands in each socket protocol implementation. To simplify that, let's add a new .gettstamp() operation in struct proto_ops, and move ioctl implementation into the common sock_ioctl()/compat_sock_ioctl_trans() functions that these all go through. We can reuse the sock_get_timestamp() implementation, but generalize it so it can deal with both native and compat mode, as well as timeval and timespec structures.
Unified · Split
| @@ -161,6 +161,8 @@ struct proto_ops { · 160 unmodified lines | ||
| 161 | 161 | int (*compat_ioctl) (struct socket *sock, unsigned int cmd, |
| 162 | 162 | unsigned long arg); |
| 163 | 163 | #endif |
| 164 | + int (*gettstamp) (struct socket *sock, void __user *userstamp, | |
| 165 | + bool timeval, bool time32); | |
| 164 | 166 | int (*listen) (struct socket *sock, int len); |
| 165 | 167 | int (*shutdown) (struct socket *sock, int flags); |
| 166 | 168 | int (*setsockopt)(struct socket *sock, int level, |
| @@ -30,9 +30,6 @@ struct compat_cmsghdr { · 29 unmodified lines | ||
| 30 | 30 | compat_int_t cmsg_type; |
| 31 | 31 | }; |
| 32 | 32 | |
| 33 | −int compat_sock_get_timestamp(struct sock *, struct timeval __user *); | |
| 34 | −int compat_sock_get_timestampns(struct sock *, struct timespec __user *); | |
| 35 | − | |
| 36 | 33 | #else /* defined(CONFIG_COMPAT) */ |
| 37 | 34 | /* |
| 38 | 35 | * To avoid compiler warnings: |
| @@ -1614,6 +1614,8 @@ int sock_setsockopt(struct socket *sock, int level, int op, · 1613 unmodified lines | ||
| 1614 | 1614 | |
| 1615 | 1615 | int sock_getsockopt(struct socket *sock, int level, int op, |
| 1616 | 1616 | char __user *optval, int __user *optlen); |
| 1617 | +int sock_gettstamp(struct socket *sock, void __user *userstamp, | |
| 1618 | + bool timeval, bool time32); | |
| 1617 | 1619 | struct sk_buff *sock_alloc_send_skb(struct sock *sk, unsigned long size, |
| 1618 | 1620 | int noblock, int *errcode); |
| 1619 | 1621 | struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len, |
| @@ -2503,8 +2505,6 @@ static inline bool sk_listener(const struct sock *sk) · 883 unmodified lines | ||
| 2503 | 2505 | } |
| 2504 | 2506 | |
| 2505 | 2507 | void sock_enable_timestamp(struct sock *sk, int flag); |
| 2506 | −int sock_get_timestamp(struct sock *, struct timeval __user *); | |
| 2507 | −int sock_get_timestampns(struct sock *, struct timespec __user *); | |
| 2508 | 2508 | int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len, int level, |
| 2509 | 2509 | int type); |
| 2510 | 2510 | |
| @@ -1806,12 +1806,6 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 1805 unmodified lines | ||
| 1806 | 1806 | rc = put_user(amount, (int __user *)argp); |
| 1807 | 1807 | break; |
| 1808 | 1808 | } |
| 1809 | − case SIOCGSTAMP: | |
| 1810 | − rc = sock_get_timestamp(sk, argp); | |
| 1811 | − break; | |
| 1812 | − case SIOCGSTAMPNS: | |
| 1813 | − rc = sock_get_timestampns(sk, argp); | |
| 1814 | − break; | |
| 1815 | 1809 | /* Routing */ |
| 1816 | 1810 | case SIOCADDRT: |
| 1817 | 1811 | case SIOCDELRT: |
| @@ -1871,6 +1865,7 @@ static const struct proto_ops atalk_dgram_ops = { · 53 unmodified lines | ||
| 1871 | 1865 | .getname = atalk_getname, |
| 1872 | 1866 | .poll = datagram_poll, |
| 1873 | 1867 | .ioctl = atalk_ioctl, |
| 1868 | + .gettstamp = sock_gettstamp, | |
| 1874 | 1869 | #ifdef CONFIG_COMPAT |
| 1875 | 1870 | .compat_ioctl = atalk_compat_ioctl, |
| 1876 | 1871 | #endif |
| @@ -81,22 +81,6 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, · 80 unmodified lines | ||
| 81 | 81 | (int __user *)argp) ? -EFAULT : 0; |
| 82 | 82 | goto done; |
| 83 | 83 | } |
| 84 | − case SIOCGSTAMP: /* borrowed from IP */ | |
| 85 | −#ifdef CONFIG_COMPAT | |
| 86 | − if (compat) | |
| 87 | − error = compat_sock_get_timestamp(sk, argp); | |
| 88 | − else | |
| 89 | −#endif | |
| 90 | − error = sock_get_timestamp(sk, argp); | |
| 91 | − goto done; | |
| 92 | − case SIOCGSTAMPNS: /* borrowed from IP */ | |
| 93 | −#ifdef CONFIG_COMPAT | |
| 94 | − if (compat) | |
| 95 | − error = compat_sock_get_timestampns(sk, argp); | |
| 96 | − else | |
| 97 | −#endif | |
| 98 | − error = sock_get_timestampns(sk, argp); | |
| 99 | − goto done; | |
| 100 | 84 | case ATM_SETSC: |
| 101 | 85 | net_warn_ratelimited("ATM_SETSC is obsolete; used by %s:%d\n", |
| 102 | 86 | current->comm, task_pid_nr(current)); |
| @@ -118,6 +118,7 @@ static const struct proto_ops pvc_proto_ops = { · 117 unmodified lines | ||
| 118 | 118 | #ifdef CONFIG_COMPAT |
| 119 | 119 | .compat_ioctl = vcc_compat_ioctl, |
| 120 | 120 | #endif |
| 121 | + .gettstamp = sock_gettstamp, | |
| 121 | 122 | .listen = sock_no_listen, |
| 122 | 123 | .shutdown = pvc_shutdown, |
| 123 | 124 | .setsockopt = pvc_setsockopt, |
| @@ -641,6 +641,7 @@ static const struct proto_ops svc_proto_ops = { · 640 unmodified lines | ||
| 641 | 641 | #ifdef CONFIG_COMPAT |
| 642 | 642 | .compat_ioctl = svc_compat_ioctl, |
| 643 | 643 | #endif |
| 644 | + .gettstamp = sock_gettstamp, | |
| 644 | 645 | .listen = svc_listen, |
| 645 | 646 | .shutdown = svc_shutdown, |
| 646 | 647 | .setsockopt = svc_setsockopt, |
| @@ -1714,14 +1714,6 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 1713 unmodified lines | ||
| 1714 | 1714 | break; |
| 1715 | 1715 | } |
| 1716 | 1716 | |
| 1717 | − case SIOCGSTAMP: | |
| 1718 | − res = sock_get_timestamp(sk, argp); | |
| 1719 | − break; | |
| 1720 | − | |
| 1721 | − case SIOCGSTAMPNS: | |
| 1722 | − res = sock_get_timestampns(sk, argp); | |
| 1723 | − break; | |
| 1724 | − | |
| 1725 | 1717 | case SIOCAX25ADDUID: /* Add a uid to the uid/call map table */ |
| 1726 | 1718 | case SIOCAX25DELUID: /* Delete a uid from the uid/call map table */ |
| 1727 | 1719 | case SIOCAX25GETUID: { |
| @@ -1950,6 +1942,7 @@ static const struct proto_ops ax25_proto_ops = { · 222 unmodified lines | ||
| 1950 | 1942 | .getname = ax25_getname, |
| 1951 | 1943 | .poll = datagram_poll, |
| 1952 | 1944 | .ioctl = ax25_ioctl, |
| 1945 | + .gettstamp = sock_gettstamp, | |
| 1953 | 1946 | .listen = ax25_listen, |
| 1954 | 1947 | .shutdown = ax25_shutdown, |
| 1955 | 1948 | .setsockopt = ax25_setsockopt, |
| @@ -521,14 +521,6 @@ int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 520 unmodified lines | ||
| 521 | 521 | err = put_user(amount, (int __user *) arg); |
| 522 | 522 | break; |
| 523 | 523 | |
| 524 | − case SIOCGSTAMP: | |
| 525 | − err = sock_get_timestamp(sk, (struct timeval __user *) arg); | |
| 526 | − break; | |
| 527 | − | |
| 528 | − case SIOCGSTAMPNS: | |
| 529 | − err = sock_get_timestampns(sk, (struct timespec __user *) arg); | |
| 530 | − break; | |
| 531 | − | |
| 532 | 524 | default: |
| 533 | 525 | err = -ENOIOCTLCMD; |
| 534 | 526 | break; |
| @@ -1655,6 +1655,7 @@ static const struct proto_ops l2cap_sock_ops = { · 1654 unmodified lines | ||
| 1655 | 1655 | .recvmsg = l2cap_sock_recvmsg, |
| 1656 | 1656 | .poll = bt_sock_poll, |
| 1657 | 1657 | .ioctl = bt_sock_ioctl, |
| 1658 | + .gettstamp = sock_gettstamp, | |
| 1658 | 1659 | .mmap = sock_no_mmap, |
| 1659 | 1660 | .socketpair = sock_no_socketpair, |
| 1660 | 1661 | .shutdown = l2cap_sock_shutdown, |
| @@ -1039,6 +1039,7 @@ static const struct proto_ops rfcomm_sock_ops = { · 1038 unmodified lines | ||
| 1039 | 1039 | .setsockopt = rfcomm_sock_setsockopt, |
| 1040 | 1040 | .getsockopt = rfcomm_sock_getsockopt, |
| 1041 | 1041 | .ioctl = rfcomm_sock_ioctl, |
| 1042 | + .gettstamp = sock_gettstamp, | |
| 1042 | 1043 | .poll = bt_sock_poll, |
| 1043 | 1044 | .socketpair = sock_no_socketpair, |
| 1044 | 1045 | .mmap = sock_no_mmap |
| @@ -1190,6 +1190,7 @@ static const struct proto_ops sco_sock_ops = { · 1189 unmodified lines | ||
| 1190 | 1190 | .recvmsg = sco_sock_recvmsg, |
| 1191 | 1191 | .poll = bt_sock_poll, |
| 1192 | 1192 | .ioctl = bt_sock_ioctl, |
| 1193 | + .gettstamp = sock_gettstamp, | |
| 1193 | 1194 | .mmap = sock_no_mmap, |
| 1194 | 1195 | .socketpair = sock_no_socketpair, |
| 1195 | 1196 | .shutdown = sco_sock_shutdown, |
| @@ -89,13 +89,7 @@ static atomic_t skbcounter = ATOMIC_INIT(0); · 88 unmodified lines | ||
| 89 | 89 | |
| 90 | 90 | int can_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) |
| 91 | 91 | { |
| 92 | − struct sock *sk = sock->sk; | |
| 93 | − | |
| 94 | 92 | switch (cmd) { |
| 95 | − | |
| 96 | − case SIOCGSTAMP: | |
| 97 | − return sock_get_timestamp(sk, (struct timeval __user *)arg); | |
| 98 | − | |
| 99 | 93 | default: |
| 100 | 94 | return -ENOIOCTLCMD; |
| 101 | 95 | } |
| @@ -1689,6 +1689,7 @@ static const struct proto_ops bcm_ops = { · 1688 unmodified lines | ||
| 1689 | 1689 | .getname = sock_no_getname, |
| 1690 | 1690 | .poll = datagram_poll, |
| 1691 | 1691 | .ioctl = can_ioctl, /* use can_ioctl() from af_can.c */ |
| 1692 | + .gettstamp = sock_gettstamp, | |
| 1692 | 1693 | .listen = sock_no_listen, |
| 1693 | 1694 | .shutdown = sock_no_shutdown, |
| 1694 | 1695 | .setsockopt = sock_no_setsockopt, |
| @@ -846,6 +846,7 @@ static const struct proto_ops raw_ops = { · 845 unmodified lines | ||
| 846 | 846 | .getname = raw_getname, |
| 847 | 847 | .poll = datagram_poll, |
| 848 | 848 | .ioctl = can_ioctl, /* use can_ioctl() from af_can.c */ |
| 849 | + .gettstamp = sock_gettstamp, | |
| 849 | 850 | .listen = sock_no_listen, |
| 850 | 851 | .shutdown = sock_no_shutdown, |
| 851 | 852 | .setsockopt = raw_setsockopt, |
| @@ -395,63 +395,6 @@ COMPAT_SYSCALL_DEFINE5(setsockopt, int, fd, int, level, int, optname, · 394 unmodified lines | ||
| 395 | 395 | return __compat_sys_setsockopt(fd, level, optname, optval, optlen); |
| 396 | 396 | } |
| 397 | 397 | |
| 398 | −int compat_sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp) | |
| 399 | −{ | |
| 400 | − struct compat_timeval __user *ctv; | |
| 401 | − int err; | |
| 402 | − struct timeval tv; | |
| 403 | − | |
| 404 | − if (COMPAT_USE_64BIT_TIME) | |
| 405 | − return sock_get_timestamp(sk, userstamp); | |
| 406 | − | |
| 407 | − ctv = (struct compat_timeval __user *) userstamp; | |
| 408 | − err = -ENOENT; | |
| 409 | − sock_enable_timestamp(sk, SOCK_TIMESTAMP); | |
| 410 | − tv = ktime_to_timeval(sock_read_timestamp(sk)); | |
| 411 | − | |
| 412 | − if (tv.tv_sec == -1) | |
| 413 | − return err; | |
| 414 | − if (tv.tv_sec == 0) { | |
| 415 | − ktime_t kt = ktime_get_real(); | |
| 416 | − sock_write_timestamp(sk, kt); | |
| 417 | − tv = ktime_to_timeval(kt); | |
| 418 | − } | |
| 419 | − err = 0; | |
| 420 | − if (put_user(tv.tv_sec, &ctv->tv_sec) || | |
| 421 | − put_user(tv.tv_usec, &ctv->tv_usec)) | |
| 422 | − err = -EFAULT; | |
| 423 | − return err; | |
| 424 | −} | |
| 425 | −EXPORT_SYMBOL(compat_sock_get_timestamp); | |
| 426 | − | |
| 427 | −int compat_sock_get_timestampns(struct sock *sk, struct timespec __user *userstamp) | |
| 428 | −{ | |
| 429 | − struct compat_timespec __user *ctv; | |
| 430 | − int err; | |
| 431 | − struct timespec ts; | |
| 432 | − | |
| 433 | − if (COMPAT_USE_64BIT_TIME) | |
| 434 | − return sock_get_timestampns (sk, userstamp); | |
| 435 | − | |
| 436 | − ctv = (struct compat_timespec __user *) userstamp; | |
| 437 | − err = -ENOENT; | |
| 438 | − sock_enable_timestamp(sk, SOCK_TIMESTAMP); | |
| 439 | − ts = ktime_to_timespec(sock_read_timestamp(sk)); | |
| 440 | − if (ts.tv_sec == -1) | |
| 441 | − return err; | |
| 442 | − if (ts.tv_sec == 0) { | |
| 443 | − ktime_t kt = ktime_get_real(); | |
| 444 | − sock_write_timestamp(sk, kt); | |
| 445 | − ts = ktime_to_timespec(kt); | |
| 446 | − } | |
| 447 | − err = 0; | |
| 448 | − if (put_user(ts.tv_sec, &ctv->tv_sec) || | |
| 449 | − put_user(ts.tv_nsec, &ctv->tv_nsec)) | |
| 450 | − err = -EFAULT; | |
| 451 | − return err; | |
| 452 | −} | |
| 453 | −EXPORT_SYMBOL(compat_sock_get_timestampns); | |
| 454 | − | |
| 455 | 398 | static int __compat_sys_getsockopt(int fd, int level, int optname, |
| 456 | 399 | char __user *optval, |
| 457 | 400 | int __user *optlen) |
| @@ -2977,39 +2977,44 @@ bool lock_sock_fast(struct sock *sk) · 2976 unmodified lines | ||
| 2977 | 2977 | } |
| 2978 | 2978 | EXPORT_SYMBOL(lock_sock_fast); |
| 2979 | 2979 | |
| 2980 | −int sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp) | |
| 2980 | +int sock_gettstamp(struct socket *sock, void __user *userstamp, | |
| 2981 | + bool timeval, bool time32) | |
| 2981 | 2982 | { |
| 2982 | − struct timeval tv; | |
| 2983 | + struct sock *sk = sock->sk; | |
| 2984 | + struct timespec64 ts; | |
| 2983 | 2985 | |
| 2984 | 2986 | sock_enable_timestamp(sk, SOCK_TIMESTAMP); |
| 2985 | − tv = ktime_to_timeval(sock_read_timestamp(sk)); | |
| 2986 | − if (tv.tv_sec == -1) | |
| 2987 | + ts = ktime_to_timespec64(sock_read_timestamp(sk)); | |
| 2988 | + if (ts.tv_sec == -1) | |
| 2987 | 2989 | return -ENOENT; |
| 2988 | − if (tv.tv_sec == 0) { | |
| 2990 | + if (ts.tv_sec == 0) { | |
| 2989 | 2991 | ktime_t kt = ktime_get_real(); |
| 2990 | − sock_write_timestamp(sk, kt); | |
| 2991 | − tv = ktime_to_timeval(kt); | |
| 2992 | + sock_write_timestamp(sk, kt);; | |
| 2993 | + ts = ktime_to_timespec64(kt); | |
| 2992 | 2994 | } |
| 2993 | − return copy_to_user(userstamp, &tv, sizeof(tv)) ? -EFAULT : 0; | |
| 2994 | −} | |
| 2995 | −EXPORT_SYMBOL(sock_get_timestamp); | |
| 2996 | 2995 | |
| 2997 | −int sock_get_timestampns(struct sock *sk, struct timespec __user *userstamp) | |
| 2998 | −{ | |
| 2999 | − struct timespec ts; | |
| 2996 | + if (timeval) | |
| 2997 | + ts.tv_nsec /= 1000; | |
| 3000 | 2998 | |
| 3001 | − sock_enable_timestamp(sk, SOCK_TIMESTAMP); | |
| 3002 | − ts = ktime_to_timespec(sock_read_timestamp(sk)); | |
| 3003 | − if (ts.tv_sec == -1) | |
| 3004 | − return -ENOENT; | |
| 3005 | − if (ts.tv_sec == 0) { | |
| 3006 | − ktime_t kt = ktime_get_real(); | |
| 3007 | − sock_write_timestamp(sk, kt); | |
| 3008 | − ts = ktime_to_timespec(sk->sk_stamp); | |
| 2999 | +#ifdef CONFIG_COMPAT_32BIT_TIME | |
| 3000 | + if (time32) | |
| 3001 | + return put_old_timespec32(&ts, userstamp); | |
| 3002 | +#endif | |
| 3003 | +#ifdef CONFIG_SPARC64 | |
| 3004 | + /* beware of padding in sparc64 timeval */ | |
| 3005 | + if (timeval && !in_compat_syscall()) { | |
| 3006 | + struct __kernel_old_timeval __user tv = { | |
| 3007 | + .tv_sec = ts.tv_sec; | |
| 3008 | + .tv_usec = ts.tv_nsec; | |
| 3009 | + }; | |
| 3010 | + if (copy_to_user(userstamp, &tv, sizeof(tv)) | |
| 3011 | + return -EFAULT; | |
| 3012 | + return 0; | |
| 3009 | 3013 | } |
| 3010 | − return copy_to_user(userstamp, &ts, sizeof(ts)) ? -EFAULT : 0; | |
| 3014 | +#endif | |
| 3015 | + return put_timespec64(&ts, userstamp); | |
| 3011 | 3016 | } |
| 3012 | −EXPORT_SYMBOL(sock_get_timestampns); | |
| 3017 | +EXPORT_SYMBOL(sock_gettstamp); | |
| 3013 | 3018 | |
| 3014 | 3019 | void sock_enable_timestamp(struct sock *sk, int flag) |
| 3015 | 3020 | { |
| @@ -991,6 +991,7 @@ static const struct proto_ops inet_dccp_ops = { · 990 unmodified lines | ||
| 991 | 991 | /* FIXME: work on tcp_poll to rename it to inet_csk_poll */ |
| 992 | 992 | .poll = dccp_poll, |
| 993 | 993 | .ioctl = inet_ioctl, |
| 994 | + .gettstamp = sock_gettstamp, | |
| 994 | 995 | /* FIXME: work on inet_listen to rename it to sock_common_listen */ |
| 995 | 996 | .listen = inet_dccp_listen, |
| 996 | 997 | .shutdown = inet_shutdown, |
| @@ -1075,6 +1075,7 @@ static const struct proto_ops inet6_dccp_ops = { · 1074 unmodified lines | ||
| 1075 | 1075 | .getname = inet6_getname, |
| 1076 | 1076 | .poll = dccp_poll, |
| 1077 | 1077 | .ioctl = inet6_ioctl, |
| 1078 | + .gettstamp = sock_gettstamp, | |
| 1078 | 1079 | .listen = inet_dccp_listen, |
| 1079 | 1080 | .shutdown = inet_shutdown, |
| 1080 | 1081 | .setsockopt = sock_common_setsockopt, |
| @@ -164,10 +164,6 @@ static int ieee802154_sock_ioctl(struct socket *sock, unsigned int cmd, · 163 unmodified lines | ||
| 164 | 164 | struct sock *sk = sock->sk; |
| 165 | 165 | |
| 166 | 166 | switch (cmd) { |
| 167 | − case SIOCGSTAMP: | |
| 168 | − return sock_get_timestamp(sk, (struct timeval __user *)arg); | |
| 169 | − case SIOCGSTAMPNS: | |
| 170 | − return sock_get_timestampns(sk, (struct timespec __user *)arg); | |
| 171 | 167 | case SIOCGIFADDR: |
| 172 | 168 | case SIOCSIFADDR: |
| 173 | 169 | return ieee802154_dev_ioctl(sk, (struct ifreq __user *)arg, |
| @@ -426,6 +422,7 @@ static const struct proto_ops ieee802154_raw_ops = { · 252 unmodified lines | ||
| 426 | 422 | .getname = sock_no_getname, |
| 427 | 423 | .poll = datagram_poll, |
| 428 | 424 | .ioctl = ieee802154_sock_ioctl, |
| 425 | + .gettstamp = sock_gettstamp, | |
| 429 | 426 | .listen = sock_no_listen, |
| 430 | 427 | .shutdown = sock_no_shutdown, |
| 431 | 428 | .setsockopt = sock_common_setsockopt, |
| @@ -988,6 +985,7 @@ static const struct proto_ops ieee802154_dgram_ops = { · 556 unmodified lines | ||
| 988 | 985 | .getname = sock_no_getname, |
| 989 | 986 | .poll = datagram_poll, |
| 990 | 987 | .ioctl = ieee802154_sock_ioctl, |
| 988 | + .gettstamp = sock_gettstamp, | |
| 991 | 989 | .listen = sock_no_listen, |
| 992 | 990 | .shutdown = sock_no_shutdown, |
| 993 | 991 | .setsockopt = sock_common_setsockopt, |
| @@ -915,12 +915,6 @@ int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 914 unmodified lines | ||
| 915 | 915 | struct rtentry rt; |
| 916 | 916 | |
| 917 | 917 | switch (cmd) { |
| 918 | − case SIOCGSTAMP: | |
| 919 | − err = sock_get_timestamp(sk, (struct timeval __user *)arg); | |
| 920 | − break; | |
| 921 | − case SIOCGSTAMPNS: | |
| 922 | − err = sock_get_timestampns(sk, (struct timespec __user *)arg); | |
| 923 | − break; | |
| 924 | 918 | case SIOCADDRT: |
| 925 | 919 | case SIOCDELRT: |
| 926 | 920 | if (copy_from_user(&rt, p, sizeof(struct rtentry))) |
| @@ -992,6 +986,7 @@ const struct proto_ops inet_stream_ops = { · 65 unmodified lines | ||
| 992 | 986 | .getname = inet_getname, |
| 993 | 987 | .poll = tcp_poll, |
| 994 | 988 | .ioctl = inet_ioctl, |
| 989 | + .gettstamp = sock_gettstamp, | |
| 995 | 990 | .listen = inet_listen, |
| 996 | 991 | .shutdown = inet_shutdown, |
| 997 | 992 | .setsockopt = sock_common_setsockopt, |
| @@ -1027,6 +1022,7 @@ const struct proto_ops inet_dgram_ops = { · 29 unmodified lines | ||
| 1027 | 1022 | .getname = inet_getname, |
| 1028 | 1023 | .poll = udp_poll, |
| 1029 | 1024 | .ioctl = inet_ioctl, |
| 1025 | + .gettstamp = sock_gettstamp, | |
| 1030 | 1026 | .listen = sock_no_listen, |
| 1031 | 1027 | .shutdown = inet_shutdown, |
| 1032 | 1028 | .setsockopt = sock_common_setsockopt, |
| @@ -1059,6 +1055,7 @@ static const struct proto_ops inet_sockraw_ops = { · 26 unmodified lines | ||
| 1059 | 1055 | .getname = inet_getname, |
| 1060 | 1056 | .poll = datagram_poll, |
| 1061 | 1057 | .ioctl = inet_ioctl, |
| 1058 | + .gettstamp = sock_gettstamp, | |
| 1062 | 1059 | .listen = sock_no_listen, |
| 1063 | 1060 | .shutdown = inet_shutdown, |
| 1064 | 1061 | .setsockopt = sock_common_setsockopt, |
| @@ -547,12 +547,6 @@ int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 546 unmodified lines | ||
| 547 | 547 | struct net *net = sock_net(sk); |
| 548 | 548 | |
| 549 | 549 | switch (cmd) { |
| 550 | − case SIOCGSTAMP: | |
| 551 | − return sock_get_timestamp(sk, (struct timeval __user *)arg); | |
| 552 | − | |
| 553 | − case SIOCGSTAMPNS: | |
| 554 | − return sock_get_timestampns(sk, (struct timespec __user *)arg); | |
| 555 | − | |
| 556 | 550 | case SIOCADDRT: |
| 557 | 551 | case SIOCDELRT: |
| 558 | 552 | |
| @@ -585,6 +579,7 @@ const struct proto_ops inet6_stream_ops = { · 26 unmodified lines | ||
| 585 | 579 | .getname = inet6_getname, |
| 586 | 580 | .poll = tcp_poll, /* ok */ |
| 587 | 581 | .ioctl = inet6_ioctl, /* must change */ |
| 582 | + .gettstamp = sock_gettstamp, | |
| 588 | 583 | .listen = inet_listen, /* ok */ |
| 589 | 584 | .shutdown = inet_shutdown, /* ok */ |
| 590 | 585 | .setsockopt = sock_common_setsockopt, /* ok */ |
| @@ -618,6 +613,7 @@ const struct proto_ops inet6_dgram_ops = { · 27 unmodified lines | ||
| 618 | 613 | .getname = inet6_getname, |
| 619 | 614 | .poll = udp_poll, /* ok */ |
| 620 | 615 | .ioctl = inet6_ioctl, /* must change */ |
| 616 | + .gettstamp = sock_gettstamp, | |
| 621 | 617 | .listen = sock_no_listen, /* ok */ |
| 622 | 618 | .shutdown = inet_shutdown, /* ok */ |
| 623 | 619 | .setsockopt = sock_common_setsockopt, /* ok */ |
| @@ -1356,6 +1356,7 @@ const struct proto_ops inet6_sockraw_ops = { · 1355 unmodified lines | ||
| 1356 | 1356 | .getname = inet6_getname, |
| 1357 | 1357 | .poll = datagram_poll, /* ok */ |
| 1358 | 1358 | .ioctl = inet6_ioctl, /* must change */ |
| 1359 | + .gettstamp = sock_gettstamp, | |
| 1359 | 1360 | .listen = sock_no_listen, /* ok */ |
| 1360 | 1361 | .shutdown = inet_shutdown, /* ok */ |
| 1361 | 1362 | .setsockopt = sock_common_setsockopt, /* ok */ |
| @@ -618,6 +618,7 @@ static const struct proto_ops l2tp_ip_ops = { · 617 unmodified lines | ||
| 618 | 618 | .getname = l2tp_ip_getname, |
| 619 | 619 | .poll = datagram_poll, |
| 620 | 620 | .ioctl = inet_ioctl, |
| 621 | + .gettstamp = sock_gettstamp, | |
| 621 | 622 | .listen = sock_no_listen, |
| 622 | 623 | .shutdown = inet_shutdown, |
| 623 | 624 | .setsockopt = sock_common_setsockopt, |
| @@ -752,6 +752,7 @@ static const struct proto_ops l2tp_ip6_ops = { · 751 unmodified lines | ||
| 752 | 752 | .getname = l2tp_ip6_getname, |
| 753 | 753 | .poll = datagram_poll, |
| 754 | 754 | .ioctl = inet6_ioctl, |
| 755 | + .gettstamp = sock_gettstamp, | |
| 755 | 756 | .listen = sock_no_listen, |
| 756 | 757 | .shutdown = inet_shutdown, |
| 757 | 758 | .setsockopt = sock_common_setsockopt, |
| @@ -1199,7 +1199,6 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 1198 unmodified lines | ||
| 1199 | 1199 | { |
| 1200 | 1200 | struct sock *sk = sock->sk; |
| 1201 | 1201 | void __user *argp = (void __user *)arg; |
| 1202 | − int ret; | |
| 1203 | 1202 | |
| 1204 | 1203 | switch (cmd) { |
| 1205 | 1204 | case TIOCOUTQ: { |
| @@ -1225,18 +1224,6 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 19 unmodified lines | ||
| 1225 | 1224 | return put_user(amount, (int __user *)argp); |
| 1226 | 1225 | } |
| 1227 | 1226 | |
| 1228 | − case SIOCGSTAMP: | |
| 1229 | − lock_sock(sk); | |
| 1230 | − ret = sock_get_timestamp(sk, argp); | |
| 1231 | − release_sock(sk); | |
| 1232 | − return ret; | |
| 1233 | − | |
| 1234 | − case SIOCGSTAMPNS: | |
| 1235 | − lock_sock(sk); | |
| 1236 | − ret = sock_get_timestampns(sk, argp); | |
| 1237 | − release_sock(sk); | |
| 1238 | − return ret; | |
| 1239 | − | |
| 1240 | 1227 | case SIOCGIFADDR: |
| 1241 | 1228 | case SIOCSIFADDR: |
| 1242 | 1229 | case SIOCGIFDSTADDR: |
| @@ -1362,6 +1349,7 @@ static const struct proto_ops nr_proto_ops = { · 119 unmodified lines | ||
| 1362 | 1349 | .getname = nr_getname, |
| 1363 | 1350 | .poll = datagram_poll, |
| 1364 | 1351 | .ioctl = nr_ioctl, |
| 1352 | + .gettstamp = sock_gettstamp, | |
| 1365 | 1353 | .listen = nr_listen, |
| 1366 | 1354 | .shutdown = sock_no_shutdown, |
| 1367 | 1355 | .setsockopt = nr_setsockopt, |
| @@ -4075,11 +4075,6 @@ static int packet_ioctl(struct socket *sock, unsigned int cmd, · 4074 unmodified lines | ||
| 4075 | 4075 | spin_unlock_bh(&sk->sk_receive_queue.lock); |
| 4076 | 4076 | return put_user(amount, (int __user *)arg); |
| 4077 | 4077 | } |
| 4078 | − case SIOCGSTAMP: | |
| 4079 | − return sock_get_timestamp(sk, (struct timeval __user *)arg); | |
| 4080 | − case SIOCGSTAMPNS: | |
| 4081 | − return sock_get_timestampns(sk, (struct timespec __user *)arg); | |
| 4082 | − | |
| 4083 | 4078 | #ifdef CONFIG_INET |
| 4084 | 4079 | case SIOCADDRT: |
| 4085 | 4080 | case SIOCDELRT: |
| @@ -4455,6 +4450,7 @@ static const struct proto_ops packet_ops_spkt = { · 369 unmodified lines | ||
| 4455 | 4450 | .getname = packet_getname_spkt, |
| 4456 | 4451 | .poll = datagram_poll, |
| 4457 | 4452 | .ioctl = packet_ioctl, |
| 4453 | + .gettstamp = sock_gettstamp, | |
| 4458 | 4454 | .listen = sock_no_listen, |
| 4459 | 4455 | .shutdown = sock_no_shutdown, |
| 4460 | 4456 | .setsockopt = sock_no_setsockopt, |
| @@ -4476,6 +4472,7 @@ static const struct proto_ops packet_ops = { · 15 unmodified lines | ||
| 4476 | 4472 | .getname = packet_getname, |
| 4477 | 4473 | .poll = packet_poll, |
| 4478 | 4474 | .ioctl = packet_ioctl, |
| 4475 | + .gettstamp = sock_gettstamp, | |
| 4479 | 4476 | .listen = sock_no_listen, |
| 4480 | 4477 | .shutdown = sock_no_shutdown, |
| 4481 | 4478 | .setsockopt = packet_setsockopt, |
| @@ -968,9 +968,6 @@ static int qrtr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 967 unmodified lines | ||
| 968 | 968 | break; |
| 969 | 969 | } |
| 970 | 970 | break; |
| 971 | − case SIOCGSTAMP: | |
| 972 | − rc = sock_get_timestamp(sk, argp); | |
| 973 | − break; | |
| 974 | 971 | case SIOCADDRT: |
| 975 | 972 | case SIOCDELRT: |
| 976 | 973 | case SIOCSIFADDR: |
| @@ -1033,6 +1030,7 @@ static const struct proto_ops qrtr_proto_ops = { · 56 unmodified lines | ||
| 1033 | 1030 | .recvmsg = qrtr_recvmsg, |
| 1034 | 1031 | .getname = qrtr_getname, |
| 1035 | 1032 | .ioctl = qrtr_ioctl, |
| 1033 | + .gettstamp = sock_gettstamp, | |
| 1036 | 1034 | .poll = datagram_poll, |
| 1037 | 1035 | .shutdown = sock_no_shutdown, |
| 1038 | 1036 | .setsockopt = sock_no_setsockopt, |
| @@ -1301,12 +1301,6 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 1300 unmodified lines | ||
| 1301 | 1301 | return put_user(amount, (unsigned int __user *) argp); |
| 1302 | 1302 | } |
| 1303 | 1303 | |
| 1304 | − case SIOCGSTAMP: | |
| 1305 | − return sock_get_timestamp(sk, (struct timeval __user *) argp); | |
| 1306 | − | |
| 1307 | − case SIOCGSTAMPNS: | |
| 1308 | − return sock_get_timestampns(sk, (struct timespec __user *) argp); | |
| 1309 | − | |
| 1310 | 1304 | case SIOCGIFADDR: |
| 1311 | 1305 | case SIOCSIFADDR: |
| 1312 | 1306 | case SIOCGIFDSTADDR: |
| @@ -1474,6 +1468,7 @@ static const struct proto_ops rose_proto_ops = { · 161 unmodified lines | ||
| 1474 | 1468 | .getname = rose_getname, |
| 1475 | 1469 | .poll = datagram_poll, |
| 1476 | 1470 | .ioctl = rose_ioctl, |
| 1471 | + .gettstamp = sock_gettstamp, | |
| 1477 | 1472 | .listen = rose_listen, |
| 1478 | 1473 | .shutdown = sock_no_shutdown, |
| 1479 | 1474 | .setsockopt = rose_setsockopt, |
| @@ -1030,6 +1030,7 @@ static const struct proto_ops inet6_seqpacket_ops = { · 1029 unmodified lines | ||
| 1030 | 1030 | .getname = sctp_getname, |
| 1031 | 1031 | .poll = sctp_poll, |
| 1032 | 1032 | .ioctl = inet6_ioctl, |
| 1033 | + .gettstamp = sock_gettstamp, | |
| 1033 | 1034 | .listen = sctp_inet_listen, |
| 1034 | 1035 | .shutdown = inet_shutdown, |
| 1035 | 1036 | .setsockopt = sock_common_setsockopt, |
| @@ -1026,6 +1026,7 @@ static const struct proto_ops inet_seqpacket_ops = { · 1025 unmodified lines | ||
| 1026 | 1026 | .getname = inet_getname, /* Semantics are different. */ |
| 1027 | 1027 | .poll = sctp_poll, |
| 1028 | 1028 | .ioctl = inet_ioctl, |
| 1029 | + .gettstamp = sock_gettstamp, | |
| 1029 | 1030 | .listen = sctp_inet_listen, |
| 1030 | 1031 | .shutdown = inet_shutdown, /* Looks harmless. */ |
| 1031 | 1032 | .setsockopt = sock_common_setsockopt, /* IP_SOL IP_OPTION is a problem */ |
| @@ -1164,6 +1164,15 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg) · 1163 unmodified lines | ||
| 1164 | 1164 | |
| 1165 | 1165 | err = open_related_ns(&net->ns, get_net_ns); |
| 1166 | 1166 | break; |
| 1167 | + case SIOCGSTAMP: | |
| 1168 | + case SIOCGSTAMPNS: | |
| 1169 | + if (!sock->ops->gettstamp) { | |
| 1170 | + err = -ENOIOCTLCMD; | |
| 1171 | + break; | |
| 1172 | + } | |
| 1173 | + err = sock->ops->gettstamp(sock, argp, | |
| 1174 | + cmd == SIOCGSTAMP, false); | |
| 1175 | + break; | |
| 1167 | 1176 | default: |
| 1168 | 1177 | err = sock_do_ioctl(net, sock, cmd, arg); |
| 1169 | 1178 | break; |
| @@ -2916,38 +2925,6 @@ void socket_seq_show(struct seq_file *seq) · 1746 unmodified lines | ||
| 2916 | 2925 | #endif /* CONFIG_PROC_FS */ |
| 2917 | 2926 | |
| 2918 | 2927 | #ifdef CONFIG_COMPAT |
| 2919 | −static int do_siocgstamp(struct net *net, struct socket *sock, | |
| 2920 | − unsigned int cmd, void __user *up) | |
| 2921 | −{ | |
| 2922 | − mm_segment_t old_fs = get_fs(); | |
| 2923 | − struct timeval ktv; | |
| 2924 | − int err; | |
| 2925 | − | |
| 2926 | − set_fs(KERNEL_DS); | |
| 2927 | − err = sock_do_ioctl(net, sock, cmd, (unsigned long)&ktv); | |
| 2928 | − set_fs(old_fs); | |
| 2929 | − if (!err) | |
| 2930 | − err = compat_put_timeval(&ktv, up); | |
| 2931 | − | |
| 2932 | − return err; | |
| 2933 | −} | |
| 2934 | − | |
| 2935 | −static int do_siocgstampns(struct net *net, struct socket *sock, | |
| 2936 | − unsigned int cmd, void __user *up) | |
| 2937 | −{ | |
| 2938 | − mm_segment_t old_fs = get_fs(); | |
| 2939 | − struct timespec kts; | |
| 2940 | − int err; | |
| 2941 | − | |
| 2942 | − set_fs(KERNEL_DS); | |
| 2943 | − err = sock_do_ioctl(net, sock, cmd, (unsigned long)&kts); | |
| 2944 | − set_fs(old_fs); | |
| 2945 | − if (!err) | |
| 2946 | − err = compat_put_timespec(&kts, up); | |
| 2947 | − | |
| 2948 | − return err; | |
| 2949 | −} | |
| 2950 | − | |
| 2951 | 2928 | static int compat_dev_ifconf(struct net *net, struct compat_ifconf __user *uifc32) |
| 2952 | 2929 | { |
| 2953 | 2930 | struct compat_ifconf ifc32; |
| @@ -3348,9 +3325,12 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock, · 394 unmodified lines | ||
| 3348 | 3325 | case SIOCDELRT: |
| 3349 | 3326 | return routing_ioctl(net, sock, cmd, argp); |
| 3350 | 3327 | case SIOCGSTAMP: |
| 3351 | − return do_siocgstamp(net, sock, cmd, argp); | |
| 3352 | 3328 | case SIOCGSTAMPNS: |
| 3353 | − return do_siocgstampns(net, sock, cmd, argp); | |
| 3329 | + if (!sock->ops->gettstamp) | |
| 3330 | + return -ENOIOCTLCMD; | |
| 3331 | + return sock->ops->gettstamp(sock, argp, cmd == SIOCGSTAMP, | |
| 3332 | + !COMPAT_USE_64BIT_TIME); | |
| 3333 | + | |
| 3354 | 3334 | case SIOCBONDSLAVEINFOQUERY: |
| 3355 | 3335 | case SIOCBONDINFOQUERY: |
| 3356 | 3336 | case SIOCSHWTSTAMP: |
| @@ -1398,18 +1398,6 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 1397 unmodified lines | ||
| 1398 | 1398 | break; |
| 1399 | 1399 | } |
| 1400 | 1400 | |
| 1401 | − case SIOCGSTAMP: | |
| 1402 | − rc = -EINVAL; | |
| 1403 | − if (sk) | |
| 1404 | − rc = sock_get_timestamp(sk, | |
| 1405 | − (struct timeval __user *)argp); | |
| 1406 | − break; | |
| 1407 | − case SIOCGSTAMPNS: | |
| 1408 | − rc = -EINVAL; | |
| 1409 | − if (sk) | |
| 1410 | − rc = sock_get_timestampns(sk, | |
| 1411 | − (struct timespec __user *)argp); | |
| 1412 | − break; | |
| 1413 | 1401 | case SIOCGIFADDR: |
| 1414 | 1402 | case SIOCSIFADDR: |
| 1415 | 1403 | case SIOCGIFDSTADDR: |
| @@ -1681,8 +1669,6 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd, · 265 unmodified lines | ||
| 1681 | 1669 | unsigned long arg) |
| 1682 | 1670 | { |
| 1683 | 1671 | void __user *argp = compat_ptr(arg); |
| 1684 | − struct sock *sk = sock->sk; | |
| 1685 | − | |
| 1686 | 1672 | int rc = -ENOIOCTLCMD; |
| 1687 | 1673 | |
| 1688 | 1674 | switch(cmd) { |
| @@ -1690,18 +1676,6 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd, · 1 unmodified line | ||
| 1690 | 1676 | case TIOCINQ: |
| 1691 | 1677 | rc = x25_ioctl(sock, cmd, (unsigned long)argp); |
| 1692 | 1678 | break; |
| 1693 | − case SIOCGSTAMP: | |
| 1694 | − rc = -EINVAL; | |
| 1695 | − if (sk) | |
| 1696 | − rc = compat_sock_get_timestamp(sk, | |
| 1697 | − (struct timeval __user*)argp); | |
| 1698 | − break; | |
| 1699 | − case SIOCGSTAMPNS: | |
| 1700 | − rc = -EINVAL; | |
| 1701 | − if (sk) | |
| 1702 | − rc = compat_sock_get_timestampns(sk, | |
| 1703 | − (struct timespec __user*)argp); | |
| 1704 | − break; | |
| 1705 | 1679 | case SIOCGIFADDR: |
| 1706 | 1680 | case SIOCSIFADDR: |
| 1707 | 1681 | case SIOCGIFDSTADDR: |
| @@ -1765,6 +1739,7 @@ static const struct proto_ops x25_proto_ops = { · 57 unmodified lines | ||
| 1765 | 1739 | #ifdef CONFIG_COMPAT |
| 1766 | 1740 | .compat_ioctl = compat_x25_ioctl, |
| 1767 | 1741 | #endif |
| 1742 | + .gettstamp = sock_gettstamp, | |
| 1768 | 1743 | .listen = x25_listen, |
| 1769 | 1744 | .shutdown = sock_no_shutdown, |
| 1770 | 1745 | .setsockopt = x25_setsockopt, |