History

net: rework SIOCGSTAMP ioctl handling

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.

Arnd Bergmann committed 7 years ago

Commit c7cbdbf1 parent 1ab839233 files · +75 −232Browse files

Unified · Split

33 files
  1. include/linux/net.h +2 −0
  2. include/net/compat.h +0 −3
  3. include/net/sock.h +2 −2
  4. net/appletalk/ddp.c +1 −6
  5. net/atm/ioctl.c +0 −16
  6. net/atm/pvc.c +1 −0
  7. net/atm/svc.c +1 −0
  8. net/ax25/af_ax25.c +1 −8
  9. net/bluetooth/af_bluetooth.c +0 −8
  10. net/bluetooth/l2cap_sock.c +1 −0
  11. net/bluetooth/rfcomm/sock.c +1 −0
  12. net/bluetooth/sco.c +1 −0
  13. net/can/af_can.c +0 −6
  14. net/can/bcm.c +1 −0
  15. net/can/raw.c +1 −0
  16. net/compat.c +0 −57
  17. net/core/sock.c +28 −23
  18. net/dccp/ipv4.c +1 −0
  19. net/dccp/ipv6.c +1 −0
  20. net/ieee802154/socket.c +2 −4
  21. net/ipv4/af_inet.c +3 −6
  22. net/ipv6/af_inet6.c +2 −6
  23. net/ipv6/raw.c +1 −0
  24. net/l2tp/l2tp_ip.c +1 −0
  25. net/l2tp/l2tp_ip6.c +1 −0
  26. net/netrom/af_netrom.c +1 −13
  27. net/packet/af_packet.c +2 −5
  28. net/qrtr/qrtr.c +1 −3
  29. net/rose/af_rose.c +1 −6
  30. net/sctp/ipv6.c +1 −0
  31. net/sctp/protocol.c +1 −0
  32. net/socket.c +14 −34
  33. net/x25/af_x25.c +1 −26
include/linux/net.h+2−0
@@ -161,6 +161,8 @@ struct proto_ops { · 160 unmodified lines
161161 int (*compat_ioctl) (struct socket *sock, unsigned int cmd,
162162 unsigned long arg);
163163 #endif
164+ int (*gettstamp) (struct socket *sock, void __user *userstamp,
165+ bool timeval, bool time32);
164166 int (*listen) (struct socket *sock, int len);
165167 int (*shutdown) (struct socket *sock, int flags);
166168 int (*setsockopt)(struct socket *sock, int level,
include/net/compat.h+0−3
@@ -30,9 +30,6 @@ struct compat_cmsghdr { · 29 unmodified lines
3030 compat_int_t cmsg_type;
3131 };
3232
33−int compat_sock_get_timestamp(struct sock *, struct timeval __user *);
34−int compat_sock_get_timestampns(struct sock *, struct timespec __user *);
35−
3633 #else /* defined(CONFIG_COMPAT) */
3734 /*
3835 * To avoid compiler warnings:
include/net/sock.h+2−2
@@ -1614,6 +1614,8 @@ int sock_setsockopt(struct socket *sock, int level, int op, · 1613 unmodified lines
16141614
16151615 int sock_getsockopt(struct socket *sock, int level, int op,
16161616 char __user *optval, int __user *optlen);
1617+int sock_gettstamp(struct socket *sock, void __user *userstamp,
1618+ bool timeval, bool time32);
16171619 struct sk_buff *sock_alloc_send_skb(struct sock *sk, unsigned long size,
16181620 int noblock, int *errcode);
16191621 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
25032505 }
25042506
25052507 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 *);
25082508 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len, int level,
25092509 int type);
25102510
net/appletalk/ddp.c+1−6
@@ -1806,12 +1806,6 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 1805 unmodified lines
18061806 rc = put_user(amount, (int __user *)argp);
18071807 break;
18081808 }
1809− case SIOCGSTAMP:
1810− rc = sock_get_timestamp(sk, argp);
1811− break;
1812− case SIOCGSTAMPNS:
1813− rc = sock_get_timestampns(sk, argp);
1814− break;
18151809 /* Routing */
18161810 case SIOCADDRT:
18171811 case SIOCDELRT:
@@ -1871,6 +1865,7 @@ static const struct proto_ops atalk_dgram_ops = { · 53 unmodified lines
18711865 .getname = atalk_getname,
18721866 .poll = datagram_poll,
18731867 .ioctl = atalk_ioctl,
1868+ .gettstamp = sock_gettstamp,
18741869 #ifdef CONFIG_COMPAT
18751870 .compat_ioctl = atalk_compat_ioctl,
18761871 #endif
net/atm/ioctl.c+0−16
@@ -81,22 +81,6 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, · 80 unmodified lines
8181 (int __user *)argp) ? -EFAULT : 0;
8282 goto done;
8383 }
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;
10084 case ATM_SETSC:
10185 net_warn_ratelimited("ATM_SETSC is obsolete; used by %s:%d\n",
10286 current->comm, task_pid_nr(current));
net/atm/pvc.c+1−0
@@ -118,6 +118,7 @@ static const struct proto_ops pvc_proto_ops = { · 117 unmodified lines
118118 #ifdef CONFIG_COMPAT
119119 .compat_ioctl = vcc_compat_ioctl,
120120 #endif
121+ .gettstamp = sock_gettstamp,
121122 .listen = sock_no_listen,
122123 .shutdown = pvc_shutdown,
123124 .setsockopt = pvc_setsockopt,
net/atm/svc.c+1−0
@@ -641,6 +641,7 @@ static const struct proto_ops svc_proto_ops = { · 640 unmodified lines
641641 #ifdef CONFIG_COMPAT
642642 .compat_ioctl = svc_compat_ioctl,
643643 #endif
644+ .gettstamp = sock_gettstamp,
644645 .listen = svc_listen,
645646 .shutdown = svc_shutdown,
646647 .setsockopt = svc_setsockopt,
net/ax25/af_ax25.c+1−8
@@ -1714,14 +1714,6 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 1713 unmodified lines
17141714 break;
17151715 }
17161716
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−
17251717 case SIOCAX25ADDUID: /* Add a uid to the uid/call map table */
17261718 case SIOCAX25DELUID: /* Delete a uid from the uid/call map table */
17271719 case SIOCAX25GETUID: {
@@ -1950,6 +1942,7 @@ static const struct proto_ops ax25_proto_ops = { · 222 unmodified lines
19501942 .getname = ax25_getname,
19511943 .poll = datagram_poll,
19521944 .ioctl = ax25_ioctl,
1945+ .gettstamp = sock_gettstamp,
19531946 .listen = ax25_listen,
19541947 .shutdown = ax25_shutdown,
19551948 .setsockopt = ax25_setsockopt,
net/bluetooth/af_bluetooth.c+0−8
@@ -521,14 +521,6 @@ int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 520 unmodified lines
521521 err = put_user(amount, (int __user *) arg);
522522 break;
523523
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−
532524 default:
533525 err = -ENOIOCTLCMD;
534526 break;
net/bluetooth/l2cap_sock.c+1−0
@@ -1655,6 +1655,7 @@ static const struct proto_ops l2cap_sock_ops = { · 1654 unmodified lines
16551655 .recvmsg = l2cap_sock_recvmsg,
16561656 .poll = bt_sock_poll,
16571657 .ioctl = bt_sock_ioctl,
1658+ .gettstamp = sock_gettstamp,
16581659 .mmap = sock_no_mmap,
16591660 .socketpair = sock_no_socketpair,
16601661 .shutdown = l2cap_sock_shutdown,
net/bluetooth/rfcomm/sock.c+1−0
@@ -1039,6 +1039,7 @@ static const struct proto_ops rfcomm_sock_ops = { · 1038 unmodified lines
10391039 .setsockopt = rfcomm_sock_setsockopt,
10401040 .getsockopt = rfcomm_sock_getsockopt,
10411041 .ioctl = rfcomm_sock_ioctl,
1042+ .gettstamp = sock_gettstamp,
10421043 .poll = bt_sock_poll,
10431044 .socketpair = sock_no_socketpair,
10441045 .mmap = sock_no_mmap
net/bluetooth/sco.c+1−0
@@ -1190,6 +1190,7 @@ static const struct proto_ops sco_sock_ops = { · 1189 unmodified lines
11901190 .recvmsg = sco_sock_recvmsg,
11911191 .poll = bt_sock_poll,
11921192 .ioctl = bt_sock_ioctl,
1193+ .gettstamp = sock_gettstamp,
11931194 .mmap = sock_no_mmap,
11941195 .socketpair = sock_no_socketpair,
11951196 .shutdown = sco_sock_shutdown,
net/can/af_can.c+0−6
@@ -89,13 +89,7 @@ static atomic_t skbcounter = ATOMIC_INIT(0); · 88 unmodified lines
8989
9090 int can_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
9191 {
92− struct sock *sk = sock->sk;
93−
9492 switch (cmd) {
95−
96− case SIOCGSTAMP:
97− return sock_get_timestamp(sk, (struct timeval __user *)arg);
98−
9993 default:
10094 return -ENOIOCTLCMD;
10195 }
net/can/bcm.c+1−0
@@ -1689,6 +1689,7 @@ static const struct proto_ops bcm_ops = { · 1688 unmodified lines
16891689 .getname = sock_no_getname,
16901690 .poll = datagram_poll,
16911691 .ioctl = can_ioctl, /* use can_ioctl() from af_can.c */
1692+ .gettstamp = sock_gettstamp,
16921693 .listen = sock_no_listen,
16931694 .shutdown = sock_no_shutdown,
16941695 .setsockopt = sock_no_setsockopt,
net/can/raw.c+1−0
@@ -846,6 +846,7 @@ static const struct proto_ops raw_ops = { · 845 unmodified lines
846846 .getname = raw_getname,
847847 .poll = datagram_poll,
848848 .ioctl = can_ioctl, /* use can_ioctl() from af_can.c */
849+ .gettstamp = sock_gettstamp,
849850 .listen = sock_no_listen,
850851 .shutdown = sock_no_shutdown,
851852 .setsockopt = raw_setsockopt,
net/compat.c+0−57
@@ -395,63 +395,6 @@ COMPAT_SYSCALL_DEFINE5(setsockopt, int, fd, int, level, int, optname, · 394 unmodified lines
395395 return __compat_sys_setsockopt(fd, level, optname, optval, optlen);
396396 }
397397
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−
455398 static int __compat_sys_getsockopt(int fd, int level, int optname,
456399 char __user *optval,
457400 int __user *optlen)
net/core/sock.c+28−23
@@ -2977,39 +2977,44 @@ bool lock_sock_fast(struct sock *sk) · 2976 unmodified lines
29772977 }
29782978 EXPORT_SYMBOL(lock_sock_fast);
29792979
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)
29812982 {
2982− struct timeval tv;
2983+ struct sock *sk = sock->sk;
2984+ struct timespec64 ts;
29832985
29842986 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)
29872989 return -ENOENT;
2988− if (tv.tv_sec == 0) {
2990+ if (ts.tv_sec == 0) {
29892991 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);
29922994 }
2993− return copy_to_user(userstamp, &tv, sizeof(tv)) ? -EFAULT : 0;
2994−}
2995−EXPORT_SYMBOL(sock_get_timestamp);
29962995
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;
30002998
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;
30093013 }
3010− return copy_to_user(userstamp, &ts, sizeof(ts)) ? -EFAULT : 0;
3014+#endif
3015+ return put_timespec64(&ts, userstamp);
30113016 }
3012−EXPORT_SYMBOL(sock_get_timestampns);
3017+EXPORT_SYMBOL(sock_gettstamp);
30133018
30143019 void sock_enable_timestamp(struct sock *sk, int flag)
30153020 {
net/dccp/ipv4.c+1−0
@@ -991,6 +991,7 @@ static const struct proto_ops inet_dccp_ops = { · 990 unmodified lines
991991 /* FIXME: work on tcp_poll to rename it to inet_csk_poll */
992992 .poll = dccp_poll,
993993 .ioctl = inet_ioctl,
994+ .gettstamp = sock_gettstamp,
994995 /* FIXME: work on inet_listen to rename it to sock_common_listen */
995996 .listen = inet_dccp_listen,
996997 .shutdown = inet_shutdown,
net/dccp/ipv6.c+1−0
@@ -1075,6 +1075,7 @@ static const struct proto_ops inet6_dccp_ops = { · 1074 unmodified lines
10751075 .getname = inet6_getname,
10761076 .poll = dccp_poll,
10771077 .ioctl = inet6_ioctl,
1078+ .gettstamp = sock_gettstamp,
10781079 .listen = inet_dccp_listen,
10791080 .shutdown = inet_shutdown,
10801081 .setsockopt = sock_common_setsockopt,
net/ieee802154/socket.c+2−4
@@ -164,10 +164,6 @@ static int ieee802154_sock_ioctl(struct socket *sock, unsigned int cmd, · 163 unmodified lines
164164 struct sock *sk = sock->sk;
165165
166166 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);
171167 case SIOCGIFADDR:
172168 case SIOCSIFADDR:
173169 return ieee802154_dev_ioctl(sk, (struct ifreq __user *)arg,
@@ -426,6 +422,7 @@ static const struct proto_ops ieee802154_raw_ops = { · 252 unmodified lines
426422 .getname = sock_no_getname,
427423 .poll = datagram_poll,
428424 .ioctl = ieee802154_sock_ioctl,
425+ .gettstamp = sock_gettstamp,
429426 .listen = sock_no_listen,
430427 .shutdown = sock_no_shutdown,
431428 .setsockopt = sock_common_setsockopt,
@@ -988,6 +985,7 @@ static const struct proto_ops ieee802154_dgram_ops = { · 556 unmodified lines
988985 .getname = sock_no_getname,
989986 .poll = datagram_poll,
990987 .ioctl = ieee802154_sock_ioctl,
988+ .gettstamp = sock_gettstamp,
991989 .listen = sock_no_listen,
992990 .shutdown = sock_no_shutdown,
993991 .setsockopt = sock_common_setsockopt,
net/ipv4/af_inet.c+3−6
@@ -915,12 +915,6 @@ int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 914 unmodified lines
915915 struct rtentry rt;
916916
917917 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;
924918 case SIOCADDRT:
925919 case SIOCDELRT:
926920 if (copy_from_user(&rt, p, sizeof(struct rtentry)))
@@ -992,6 +986,7 @@ const struct proto_ops inet_stream_ops = { · 65 unmodified lines
992986 .getname = inet_getname,
993987 .poll = tcp_poll,
994988 .ioctl = inet_ioctl,
989+ .gettstamp = sock_gettstamp,
995990 .listen = inet_listen,
996991 .shutdown = inet_shutdown,
997992 .setsockopt = sock_common_setsockopt,
@@ -1027,6 +1022,7 @@ const struct proto_ops inet_dgram_ops = { · 29 unmodified lines
10271022 .getname = inet_getname,
10281023 .poll = udp_poll,
10291024 .ioctl = inet_ioctl,
1025+ .gettstamp = sock_gettstamp,
10301026 .listen = sock_no_listen,
10311027 .shutdown = inet_shutdown,
10321028 .setsockopt = sock_common_setsockopt,
@@ -1059,6 +1055,7 @@ static const struct proto_ops inet_sockraw_ops = { · 26 unmodified lines
10591055 .getname = inet_getname,
10601056 .poll = datagram_poll,
10611057 .ioctl = inet_ioctl,
1058+ .gettstamp = sock_gettstamp,
10621059 .listen = sock_no_listen,
10631060 .shutdown = inet_shutdown,
10641061 .setsockopt = sock_common_setsockopt,
net/ipv6/af_inet6.c+2−6
@@ -547,12 +547,6 @@ int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 546 unmodified lines
547547 struct net *net = sock_net(sk);
548548
549549 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−
556550 case SIOCADDRT:
557551 case SIOCDELRT:
558552
@@ -585,6 +579,7 @@ const struct proto_ops inet6_stream_ops = { · 26 unmodified lines
585579 .getname = inet6_getname,
586580 .poll = tcp_poll, /* ok */
587581 .ioctl = inet6_ioctl, /* must change */
582+ .gettstamp = sock_gettstamp,
588583 .listen = inet_listen, /* ok */
589584 .shutdown = inet_shutdown, /* ok */
590585 .setsockopt = sock_common_setsockopt, /* ok */
@@ -618,6 +613,7 @@ const struct proto_ops inet6_dgram_ops = { · 27 unmodified lines
618613 .getname = inet6_getname,
619614 .poll = udp_poll, /* ok */
620615 .ioctl = inet6_ioctl, /* must change */
616+ .gettstamp = sock_gettstamp,
621617 .listen = sock_no_listen, /* ok */
622618 .shutdown = inet_shutdown, /* ok */
623619 .setsockopt = sock_common_setsockopt, /* ok */
net/ipv6/raw.c+1−0
@@ -1356,6 +1356,7 @@ const struct proto_ops inet6_sockraw_ops = { · 1355 unmodified lines
13561356 .getname = inet6_getname,
13571357 .poll = datagram_poll, /* ok */
13581358 .ioctl = inet6_ioctl, /* must change */
1359+ .gettstamp = sock_gettstamp,
13591360 .listen = sock_no_listen, /* ok */
13601361 .shutdown = inet_shutdown, /* ok */
13611362 .setsockopt = sock_common_setsockopt, /* ok */
net/l2tp/l2tp_ip.c+1−0
@@ -618,6 +618,7 @@ static const struct proto_ops l2tp_ip_ops = { · 617 unmodified lines
618618 .getname = l2tp_ip_getname,
619619 .poll = datagram_poll,
620620 .ioctl = inet_ioctl,
621+ .gettstamp = sock_gettstamp,
621622 .listen = sock_no_listen,
622623 .shutdown = inet_shutdown,
623624 .setsockopt = sock_common_setsockopt,
net/l2tp/l2tp_ip6.c+1−0
@@ -752,6 +752,7 @@ static const struct proto_ops l2tp_ip6_ops = { · 751 unmodified lines
752752 .getname = l2tp_ip6_getname,
753753 .poll = datagram_poll,
754754 .ioctl = inet6_ioctl,
755+ .gettstamp = sock_gettstamp,
755756 .listen = sock_no_listen,
756757 .shutdown = inet_shutdown,
757758 .setsockopt = sock_common_setsockopt,
net/netrom/af_netrom.c+1−13
@@ -1199,7 +1199,6 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 1198 unmodified lines
11991199 {
12001200 struct sock *sk = sock->sk;
12011201 void __user *argp = (void __user *)arg;
1202− int ret;
12031202
12041203 switch (cmd) {
12051204 case TIOCOUTQ: {
@@ -1225,18 +1224,6 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 19 unmodified lines
12251224 return put_user(amount, (int __user *)argp);
12261225 }
12271226
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−
12401227 case SIOCGIFADDR:
12411228 case SIOCSIFADDR:
12421229 case SIOCGIFDSTADDR:
@@ -1362,6 +1349,7 @@ static const struct proto_ops nr_proto_ops = { · 119 unmodified lines
13621349 .getname = nr_getname,
13631350 .poll = datagram_poll,
13641351 .ioctl = nr_ioctl,
1352+ .gettstamp = sock_gettstamp,
13651353 .listen = nr_listen,
13661354 .shutdown = sock_no_shutdown,
13671355 .setsockopt = nr_setsockopt,
net/packet/af_packet.c+2−5
@@ -4075,11 +4075,6 @@ static int packet_ioctl(struct socket *sock, unsigned int cmd, · 4074 unmodified lines
40754075 spin_unlock_bh(&sk->sk_receive_queue.lock);
40764076 return put_user(amount, (int __user *)arg);
40774077 }
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−
40834078 #ifdef CONFIG_INET
40844079 case SIOCADDRT:
40854080 case SIOCDELRT:
@@ -4455,6 +4450,7 @@ static const struct proto_ops packet_ops_spkt = { · 369 unmodified lines
44554450 .getname = packet_getname_spkt,
44564451 .poll = datagram_poll,
44574452 .ioctl = packet_ioctl,
4453+ .gettstamp = sock_gettstamp,
44584454 .listen = sock_no_listen,
44594455 .shutdown = sock_no_shutdown,
44604456 .setsockopt = sock_no_setsockopt,
@@ -4476,6 +4472,7 @@ static const struct proto_ops packet_ops = { · 15 unmodified lines
44764472 .getname = packet_getname,
44774473 .poll = packet_poll,
44784474 .ioctl = packet_ioctl,
4475+ .gettstamp = sock_gettstamp,
44794476 .listen = sock_no_listen,
44804477 .shutdown = sock_no_shutdown,
44814478 .setsockopt = packet_setsockopt,
net/qrtr/qrtr.c+1−3
@@ -968,9 +968,6 @@ static int qrtr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 967 unmodified lines
968968 break;
969969 }
970970 break;
971− case SIOCGSTAMP:
972− rc = sock_get_timestamp(sk, argp);
973− break;
974971 case SIOCADDRT:
975972 case SIOCDELRT:
976973 case SIOCSIFADDR:
@@ -1033,6 +1030,7 @@ static const struct proto_ops qrtr_proto_ops = { · 56 unmodified lines
10331030 .recvmsg = qrtr_recvmsg,
10341031 .getname = qrtr_getname,
10351032 .ioctl = qrtr_ioctl,
1033+ .gettstamp = sock_gettstamp,
10361034 .poll = datagram_poll,
10371035 .shutdown = sock_no_shutdown,
10381036 .setsockopt = sock_no_setsockopt,
net/rose/af_rose.c+1−6
@@ -1301,12 +1301,6 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 1300 unmodified lines
13011301 return put_user(amount, (unsigned int __user *) argp);
13021302 }
13031303
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−
13101304 case SIOCGIFADDR:
13111305 case SIOCSIFADDR:
13121306 case SIOCGIFDSTADDR:
@@ -1474,6 +1468,7 @@ static const struct proto_ops rose_proto_ops = { · 161 unmodified lines
14741468 .getname = rose_getname,
14751469 .poll = datagram_poll,
14761470 .ioctl = rose_ioctl,
1471+ .gettstamp = sock_gettstamp,
14771472 .listen = rose_listen,
14781473 .shutdown = sock_no_shutdown,
14791474 .setsockopt = rose_setsockopt,
net/sctp/ipv6.c+1−0
@@ -1030,6 +1030,7 @@ static const struct proto_ops inet6_seqpacket_ops = { · 1029 unmodified lines
10301030 .getname = sctp_getname,
10311031 .poll = sctp_poll,
10321032 .ioctl = inet6_ioctl,
1033+ .gettstamp = sock_gettstamp,
10331034 .listen = sctp_inet_listen,
10341035 .shutdown = inet_shutdown,
10351036 .setsockopt = sock_common_setsockopt,
net/sctp/protocol.c+1−0
@@ -1026,6 +1026,7 @@ static const struct proto_ops inet_seqpacket_ops = { · 1025 unmodified lines
10261026 .getname = inet_getname, /* Semantics are different. */
10271027 .poll = sctp_poll,
10281028 .ioctl = inet_ioctl,
1029+ .gettstamp = sock_gettstamp,
10291030 .listen = sctp_inet_listen,
10301031 .shutdown = inet_shutdown, /* Looks harmless. */
10311032 .setsockopt = sock_common_setsockopt, /* IP_SOL IP_OPTION is a problem */
net/socket.c+14−34
@@ -1164,6 +1164,15 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg) · 1163 unmodified lines
11641164
11651165 err = open_related_ns(&net->ns, get_net_ns);
11661166 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;
11671176 default:
11681177 err = sock_do_ioctl(net, sock, cmd, arg);
11691178 break;
@@ -2916,38 +2925,6 @@ void socket_seq_show(struct seq_file *seq) · 1746 unmodified lines
29162925 #endif /* CONFIG_PROC_FS */
29172926
29182927 #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−
29512928 static int compat_dev_ifconf(struct net *net, struct compat_ifconf __user *uifc32)
29522929 {
29532930 struct compat_ifconf ifc32;
@@ -3348,9 +3325,12 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock, · 394 unmodified lines
33483325 case SIOCDELRT:
33493326 return routing_ioctl(net, sock, cmd, argp);
33503327 case SIOCGSTAMP:
3351− return do_siocgstamp(net, sock, cmd, argp);
33523328 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+
33543334 case SIOCBONDSLAVEINFOQUERY:
33553335 case SIOCBONDINFOQUERY:
33563336 case SIOCSHWTSTAMP:
net/x25/af_x25.c+1−26
@@ -1398,18 +1398,6 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · 1397 unmodified lines
13981398 break;
13991399 }
14001400
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;
14131401 case SIOCGIFADDR:
14141402 case SIOCSIFADDR:
14151403 case SIOCGIFDSTADDR:
@@ -1681,8 +1669,6 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd, · 265 unmodified lines
16811669 unsigned long arg)
16821670 {
16831671 void __user *argp = compat_ptr(arg);
1684− struct sock *sk = sock->sk;
1685−
16861672 int rc = -ENOIOCTLCMD;
16871673
16881674 switch(cmd) {
@@ -1690,18 +1676,6 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd, · 1 unmodified line
16901676 case TIOCINQ:
16911677 rc = x25_ioctl(sock, cmd, (unsigned long)argp);
16921678 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;
17051679 case SIOCGIFADDR:
17061680 case SIOCSIFADDR:
17071681 case SIOCGIFDSTADDR:
@@ -1765,6 +1739,7 @@ static const struct proto_ops x25_proto_ops = { · 57 unmodified lines
17651739 #ifdef CONFIG_COMPAT
17661740 .compat_ioctl = compat_x25_ioctl,
17671741 #endif
1742+ .gettstamp = sock_gettstamp,
17681743 .listen = x25_listen,
17691744 .shutdown = sock_no_shutdown,
17701745 .setsockopt = x25_setsockopt,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t