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

Commit 13c6ee2a authored by Deepa Dinamani's avatar Deepa Dinamani Committed by David S. Miller
Browse files

socket: Use old_timeval types for socket timestamps 



As part of y2038 solution, all internal uses of
struct timeval are replaced by struct __kernel_old_timeval
and struct compat_timeval by struct old_timeval32.
Make socket timestamps use these new types.

This is mainly to be able to verify that the kernel build
is y2038 safe when such non y2038 safe types are not
supported anymore.

Signed-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Acked-by: default avatarWillem de Bruijn <willemb@google.com>
Cc: isdn@linux-pingi.de
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bcb3fc32

drivers/isdn/mISDN/socket.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ mISDN_ctrl(struct mISDNchannel *ch, u_int cmd, void *arg) 
static inline void

mISDN_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_buff *skb)

{

	struct timeval	tv;

	struct __kernel_old_timeval	tv;



	if (_pms(sk)->cmask & MISDN_TIME_STAMP) {

		skb_get_timestamp(skb, &tv);

include/linux/skbuff.h

+3 −3
Original line number Diff line number Diff line
@@ -3486,16 +3486,16 @@ static inline ktime_t skb_get_ktime(const struct sk_buff *skb) 
/**

 *	skb_get_timestamp - get timestamp from a skb

 *	@skb: skb to get stamp from

 *	@stamp: pointer to struct timeval to store stamp in

 *	@stamp: pointer to struct __kernel_old_timeval to store stamp in

 *

 *	Timestamps are stored in the skb as offsets to a base timestamp.

 *	This function converts the offset back to a struct timeval and stores

 *	it in stamp.

 */

static inline void skb_get_timestamp(const struct sk_buff *skb,

				     struct timeval *stamp)

				     struct __kernel_old_timeval *stamp)

{

	*stamp = ktime_to_timeval(skb->tstamp);

	*stamp = ns_to_kernel_old_timeval(skb->tstamp);

}



static inline void skb_get_timestampns(const struct sk_buff *skb,

net/bluetooth/hci_sock.c

+2 −2
Original line number Diff line number Diff line
@@ -1383,9 +1383,9 @@ static void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, 


	if (mask & HCI_CMSG_TSTAMP) {

#ifdef CONFIG_COMPAT

		struct compat_timeval ctv;

		struct old_timeval32 ctv;

#endif

		struct timeval tv;

		struct __kernel_old_timeval tv;

		void *data;

		int len;

net/compat.c

+3 −3
Original line number Diff line number Diff line
@@ -209,8 +209,8 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat 
{

	struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;

	struct compat_cmsghdr cmhdr;

	struct compat_timeval ctv;

	struct compat_timespec cts[3];

	struct old_timeval32 ctv;

	struct old_timespec32 cts[3];

	int cmlen;



	if (cm == NULL || kmsg->msg_controllen < sizeof(*cm)) {
@@ -220,7 +220,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat 


	if (!COMPAT_USE_64BIT_TIME) {

		if (level == SOL_SOCKET && type == SO_TIMESTAMP_OLD) {

			struct timeval *tv = (struct timeval *)data;

			struct __kernel_old_timeval *tv = (struct __kernel_old_timeval *)data;

			ctv.tv_sec = tv->tv_sec;

			ctv.tv_usec = tv->tv_usec;

			data = &ctv;

net/ipv4/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -1861,7 +1861,7 @@ static void tcp_update_recv_tstamps(struct sk_buff *skb, 
static void tcp_recv_timestamp(struct msghdr *msg, const struct sock *sk,

			       struct scm_timestamping *tss)

{

	struct timeval tv;

	struct __kernel_old_timeval tv;

	bool has_timestamping = false;



	if (tss->ts[0].tv_sec || tss->ts[0].tv_nsec) {