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

Commit f0ac2614 authored by Shaun Pereira's avatar Shaun Pereira Committed by David S. Miller
Browse files

[NET]: socket timestamp 32 bit handler for 64 bit kernel 



Get socket timestamp handler function that does not use the
ioctl32_hash_table.

Signed-off-by: default avatarShaun Pereira <spereira@tusc.com.au>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 89bbfc95

include/net/compat.h

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

};



struct sock;

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



#else /* defined(CONFIG_COMPAT) */

#define compat_msghdr	msghdr		/* to avoid compiler warnings */

#endif /* defined(CONFIG_COMPAT) */
@@ -34,7 +37,6 @@ extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsi 
extern asmlinkage long compat_sys_getsockopt(int, int, int, char __user *, int __user *);

extern int put_cmsg_compat(struct msghdr*, int, int, int, void *);



struct sock;

extern int cmsghdr_from_user_compat_to_kern(struct msghdr *, struct sock *, unsigned char *, int);



#endif /* NET_COMPAT_H */

net/compat.c

+19 −0
Original line number Diff line number Diff line
@@ -543,6 +543,25 @@ static int compat_sock_getsockopt(struct socket *sock, int level, int optname, 
	return sock_getsockopt(sock, level, optname, optval, optlen);

}



int compat_sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp)

{

	struct compat_timeval __user *ctv =

			(struct compat_timeval __user*) userstamp;

	int err = -ENOENT;



	if (!sock_flag(sk, SOCK_TIMESTAMP))

		sock_enable_timestamp(sk);

	if (sk->sk_stamp.tv_sec == -1)

		return err;

	if (sk->sk_stamp.tv_sec == 0)

		do_gettimeofday(&sk->sk_stamp);

	if (put_user(sk->sk_stamp.tv_sec, &ctv->tv_sec) ||

			put_user(sk->sk_stamp.tv_usec, &ctv->tv_usec))

		err = -EFAULT;

	return err;

}

EXPORT_SYMBOL(compat_sock_get_timestamp);



asmlinkage long compat_sys_getsockopt(int fd, int level, int optname,

				char __user *optval, int __user *optlen)

{