diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-02-19 17:51:59 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-02-20 12:48:48 -0800 |
| commit | 644595f89620ba8446cc555be336d24a34464950 (patch) | |
| tree | c5d1533e9ba7f7347c50ff9351763364c2fe6282 /net/socket.c | |
| parent | ee4fa23c4bfcc635d077a9633d405610de45bc70 (diff) | |
| download | linux-644595f89620ba8446cc555be336d24a34464950.tar.gz linux-644595f89620ba8446cc555be336d24a34464950.tar.bz2 linux-644595f89620ba8446cc555be336d24a34464950.zip | |
compat: Handle COMPAT_USE_64BIT_TIME in net/socket.c
Use helper functions aware of COMPAT_USE_64BIT_TIME to write struct
timeval and struct timespec to userspace in net/socket.c.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/net/socket.c b/net/socket.c index 28a96af484b4..5325d4c797c9 100644 --- a/net/socket.c +++ b/net/socket.c @@ -2600,7 +2600,7 @@ void socket_seq_show(struct seq_file *seq) #ifdef CONFIG_COMPAT static int do_siocgstamp(struct net *net, struct socket *sock, - unsigned int cmd, struct compat_timeval __user *up) + unsigned int cmd, void __user *up) { mm_segment_t old_fs = get_fs(); struct timeval ktv; @@ -2609,15 +2609,14 @@ static int do_siocgstamp(struct net *net, struct socket *sock, set_fs(KERNEL_DS); err = sock_do_ioctl(net, sock, cmd, (unsigned long)&ktv); set_fs(old_fs); - if (!err) { - err = put_user(ktv.tv_sec, &up->tv_sec); - err |= __put_user(ktv.tv_usec, &up->tv_usec); - } + if (!err) + err = compat_put_timeval(up, &ktv); + return err; } static int do_siocgstampns(struct net *net, struct socket *sock, - unsigned int cmd, struct compat_timespec __user *up) + unsigned int cmd, void __user *up) { mm_segment_t old_fs = get_fs(); struct timespec kts; @@ -2626,10 +2625,9 @@ static int do_siocgstampns(struct net *net, struct socket *sock, set_fs(KERNEL_DS); err = sock_do_ioctl(net, sock, cmd, (unsigned long)&kts); set_fs(old_fs); - if (!err) { - err = put_user(kts.tv_sec, &up->tv_sec); - err |= __put_user(kts.tv_nsec, &up->tv_nsec); - } + if (!err) + err = compat_put_timespec(up, &kts); + return err; } |