diff options
Diffstat (limited to 'net/compat.c')
-rw-r--r-- | net/compat.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/net/compat.c b/net/compat.c index 75bfcbbb2e3e..cdf5b0c1b962 100644 --- a/net/compat.c +++ b/net/compat.c | |||
@@ -509,8 +509,9 @@ int compat_sock_get_timestampns(struct sock *sk, struct timespec __user *usersta | |||
509 | } | 509 | } |
510 | EXPORT_SYMBOL(compat_sock_get_timestampns); | 510 | EXPORT_SYMBOL(compat_sock_get_timestampns); |
511 | 511 | ||
512 | COMPAT_SYSCALL_DEFINE5(getsockopt, int, fd, int, level, int, optname, | 512 | static int __compat_sys_getsockopt(int fd, int level, int optname, |
513 | char __user *, optval, int __user *, optlen) | 513 | char __user *optval, |
514 | int __user *optlen) | ||
514 | { | 515 | { |
515 | int err; | 516 | int err; |
516 | struct socket *sock = sockfd_lookup(fd, &err); | 517 | struct socket *sock = sockfd_lookup(fd, &err); |
@@ -536,6 +537,12 @@ COMPAT_SYSCALL_DEFINE5(getsockopt, int, fd, int, level, int, optname, | |||
536 | return err; | 537 | return err; |
537 | } | 538 | } |
538 | 539 | ||
540 | COMPAT_SYSCALL_DEFINE5(getsockopt, int, fd, int, level, int, optname, | ||
541 | char __user *, optval, int __user *, optlen) | ||
542 | { | ||
543 | return __compat_sys_getsockopt(fd, level, optname, optval, optlen); | ||
544 | } | ||
545 | |||
539 | struct compat_group_req { | 546 | struct compat_group_req { |
540 | __u32 gr_interface; | 547 | __u32 gr_interface; |
541 | struct __kernel_sockaddr_storage gr_group | 548 | struct __kernel_sockaddr_storage gr_group |
@@ -874,8 +881,9 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args) | |||
874 | compat_ptr(a[3]), a[4]); | 881 | compat_ptr(a[3]), a[4]); |
875 | break; | 882 | break; |
876 | case SYS_GETSOCKOPT: | 883 | case SYS_GETSOCKOPT: |
877 | ret = compat_sys_getsockopt(a0, a1, a[2], | 884 | ret = __compat_sys_getsockopt(a0, a1, a[2], |
878 | compat_ptr(a[3]), compat_ptr(a[4])); | 885 | compat_ptr(a[3]), |
886 | compat_ptr(a[4])); | ||
879 | break; | 887 | break; |
880 | case SYS_SENDMSG: | 888 | case SYS_SENDMSG: |
881 | ret = compat_sys_sendmsg(a0, compat_ptr(a1), a[2]); | 889 | ret = compat_sys_sendmsg(a0, compat_ptr(a1), a[2]); |