diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-07-17 08:23:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-20 03:16:40 +0200 |
| commit | 55db9c0e853421fa71cac5e6855898601f78a1f5 (patch) | |
| tree | a1d10351c2e9a1c86cb0b481a98ada9745589195 /arch/x86/entry/syscall_x32.c | |
| parent | net: remove compat_sock_common_{get,set}sockopt (diff) | |
| download | linux-55db9c0e853421fa71cac5e6855898601f78a1f5.tar.xz linux-55db9c0e853421fa71cac5e6855898601f78a1f5.zip | |
net: remove compat_sys_{get,set}sockopt
Now that the ->compat_{get,set}sockopt proto_ops methods are gone
there is no good reason left to keep the compat syscalls separate.
This fixes the odd use of unsigned int for the compat_setsockopt
optlen and the missing sock_use_custom_sol_socket.
It would also easily allow running the eBPF hooks for the compat
syscalls, but such a large change in behavior does not belong into
a consolidation patch like this one.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/x86/entry/syscall_x32.c')
| -rw-r--r-- | arch/x86/entry/syscall_x32.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/entry/syscall_x32.c b/arch/x86/entry/syscall_x32.c index 3d8d70d3896c..1583831f61a9 100644 --- a/arch/x86/entry/syscall_x32.c +++ b/arch/x86/entry/syscall_x32.c @@ -8,6 +8,13 @@ #include <asm/unistd.h> #include <asm/syscall.h> +/* + * Reuse the 64-bit entry points for the x32 versions that occupy different + * slots in the syscall table. + */ +#define __x32_sys_getsockopt __x64_sys_getsockopt +#define __x32_sys_setsockopt __x64_sys_setsockopt + #define __SYSCALL_64(nr, sym) #define __SYSCALL_X32(nr, sym) extern long __x32_##sym(const struct pt_regs *); |