Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7cbdbf2 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

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.

Acked-by: default avatarStefan Schmidt <stefan@datenfreihafen.org>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Acked-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Link: https://lore.kernel.org/lkml/CAK8P3a038aDQQotzua_QtKGhq8O9n+rdiz2=WDCp82ys8eUT+A@mail.gmail.com/


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ab83928

include/linux/net.h

+2 −0
Original line number Diff line number Diff line
@@ -161,6 +161,8 @@ struct proto_ops { 
	int	 	(*compat_ioctl) (struct socket *sock, unsigned int cmd,

				      unsigned long arg);

#endif

	int		(*gettstamp) (struct socket *sock, void __user *userstamp,

				      bool timeval, bool time32);

	int		(*listen)    (struct socket *sock, int len);

	int		(*shutdown)  (struct socket *sock, int flags);

	int		(*setsockopt)(struct socket *sock, int level,

include/net/compat.h

+0 −3
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ struct compat_cmsghdr { 
	compat_int_t	cmsg_type;

};



int compat_sock_get_timestamp(struct sock *, struct timeval __user *);

int compat_sock_get_timestampns(struct sock *, struct timespec __user *);



#else /* defined(CONFIG_COMPAT) */

/*

 * To avoid compiler warnings:

include/net/sock.h

+2 −2
Original line number Diff line number Diff line
@@ -1614,6 +1614,8 @@ int sock_setsockopt(struct socket *sock, int level, int op, 


int sock_getsockopt(struct socket *sock, int level, int op,

		    char __user *optval, int __user *optlen);

int sock_gettstamp(struct socket *sock, void __user *userstamp,

		   bool timeval, bool time32);

struct sk_buff *sock_alloc_send_skb(struct sock *sk, unsigned long size,

				    int noblock, int *errcode);

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) 
}



void sock_enable_timestamp(struct sock *sk, int flag);

int sock_get_timestamp(struct sock *, struct timeval __user *);

int sock_get_timestampns(struct sock *, struct timespec __user *);

int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len, int level,

		       int type);

net/appletalk/ddp.c

+1 −6
Original line number Diff line number Diff line
@@ -1806,12 +1806,6 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 
		rc = put_user(amount, (int __user *)argp);

		break;

	}

	case SIOCGSTAMP:

		rc = sock_get_timestamp(sk, argp);

		break;

	case SIOCGSTAMPNS:

		rc = sock_get_timestampns(sk, argp);

		break;

	/* Routing */

	case SIOCADDRT:

	case SIOCDELRT:
@@ -1871,6 +1865,7 @@ static const struct proto_ops atalk_dgram_ops = { 
	.getname	= atalk_getname,

	.poll		= datagram_poll,

	.ioctl		= atalk_ioctl,

	.gettstamp	= sock_gettstamp,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= atalk_compat_ioctl,

#endif

net/atm/ioctl.c

+0 −16
Original line number Diff line number Diff line
@@ -81,22 +81,6 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, 
				 (int __user *)argp) ? -EFAULT : 0;

		goto done;

	}

	case SIOCGSTAMP: /* borrowed from IP */

#ifdef CONFIG_COMPAT

		if (compat)

			error = compat_sock_get_timestamp(sk, argp);

		else

#endif

			error = sock_get_timestamp(sk, argp);

		goto done;

	case SIOCGSTAMPNS: /* borrowed from IP */

#ifdef CONFIG_COMPAT

		if (compat)

			error = compat_sock_get_timestampns(sk, argp);

		else

#endif

			error = sock_get_timestampns(sk, argp);

		goto done;

	case ATM_SETSC:

		net_warn_ratelimited("ATM_SETSC is obsolete; used by %s:%d\n",

				     current->comm, task_pid_nr(current));