x86, syscalls: use SYSCALL_DEFINE() macros for sys_modify_ldt()
Subsystems (2)
Dave Hansen
maintainerPATCH 1/1 x86, syscalls: use SYSCALL_DEFINE() macros for sys_modify_ldt()
We do not have tracepoints for sys_modify_ldt() because we define it directly instead of using the normal SYSCALL_DEFINEx() macros.
However, there is a reason sys_modify_ldt() does not use the macros:
it has an 'int' return type instead of 'unsigned long'. This is a bug, but it's a bug cemented in the ABI.
What does this mean? If we return -EINVAL from a function that returns 'int', we have 0x00000000ffffffea in %rax. But, if we return -EINVAL from a function returning 'unsigned long', we end up with 0xffffffffffffffea in %rax, which is wrong.
To work around this and maintain the 'int' behavior while using the SYSCALL_DEFINEx() macros, so we add a cast to 'unsigned int' in both implementations of sys_modify_ldt().
---
b/arch/x86/include/asm/syscalls.h | 2 +- b/arch/x86/kernel/ldt.c | 16 +++++++++++++--- b/arch/x86/um/ldt.c | 6 ++++-- 3 files changed, 18 insertions(+), 6 deletions(-)
arch/x86/include/asm/syscalls.h renamed from arch/x86/include/asm/syscalls.h~x86-syscall-macros-modify_ldt +1 -1
@@ -21,7 +21,7 @@ asmlinkage long sys_ioperm(unsigned longasmlinkage long sys_iopl (unsigned int );/* kernel/ldt.c */ -asmlinkage int sys_modify_ldt(int, void __user *, unsigned long); +asmlinkage long sys_modify_ldt (int ,void __user *,unsigned long );/* kernel/signal.c */ asmlinkage long sys_rt_sigreturn (void );
arch/x86/kernel/ldt.c renamed from arch/x86/kernel/ldt.c~x86-syscall-macros-modify_ldt +13 -3
@@ -12,6 +12,7 @@#include <linux/string.h> #include <linux/mm.h> #include <linux/smp.h> +#include <linux/syscalls.h> #include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/uaccess.h>
@@ -294,8 +295,8 @@ out:return error; } -asmlinkage int sys_modify_ldt(int func, void __user *ptr, -unsigned long bytecount) +SYSCALL_DEFINE3(modify_ldt, int , func , void __user * , ptr , + unsigned long , bytecount) {int ret = -ENOSYS ;
@@ -313,5 +314,14 @@ asmlinkage int sys_modify_ldt(int func, ret =write_ldt (ptr, bytecount,0 );break ; } -return ret; +/* +* The SYSCALL_DEFINE() macros give us an 'unsigned long' +* return type, but tht ABI for sys_modify_ldt() expects +* 'int'. This cast gives us an int-sized value in %rax +* for the return code. The 'unsigned' is necessary so +* the compiler does not try to sign-extend the negative +* return codes into the high half of the register when +* taking the value from int->long. +*/ +return (unsigned int )ret; }
arch/x86/um/ldt.c renamed from arch/x86/um/ldt.c~x86-syscall-macros-modify_ldt +4 -2
@@ -369,7 +369,9 @@ void free_ldt(struct mm_context *mm) mm->arch.ldt.entry_count =0 ; } -int sys_modify_ldt (int func,void __user *ptr,unsigned long bytecount) +SYSCALL_DEFINE3(modify_ldt, int , func , void __user * , ptr , + unsigned long , bytecount) { -return do_modify_ldt_skas (func, ptr, bytecount); +/* See non-um modify_ldt() for why we do this cast */ +return (unsigned int )do_modify_ldt_skas (func, ptr, bytecount); }
_
Quoted 8 lines · Dave Hansen
We do not have tracepoints for
sys_modify_ldt()because we define it directly instead of using the normalSYSCALL_DEFINEx()macros.However, there is a reason
sys_modify_ldt()does not use the macros:
it has an 'int' return type instead of 'unsigned long'. This is a bug, but it's a bug cemented in the ABI.
Quoted 8 lines
What does this mean? If we return
-EINVALfrom a function that returns 'int', we have0x00000000ffffffeain %rax. But, if we return-EINVALfrom a function returning 'unsigned long', we end up with0xffffffffffffffeain %rax, which is wrong.To work around this and maintain the 'int' behavior while using the
SYSCALL_DEFINEx()macros, so we add a cast to 'unsigned int' in both implementations ofsys_modify_ldt().
Quoted 78 lines
---
b/arch/x86/include/asm/syscalls.h | 2 +- b/arch/x86/kernel/ldt.c | 16 +++++++++++++--- b/arch/x86/um/ldt.c | 6 ++++-- 3 files changed, 18 insertions(+), 6 deletions(-)diff -puN
arch/x86/include/asm/syscalls.h~x86-syscall-macros-modify_ldtarch/x86/include/asm/syscalls.harch/x86/include/asm/syscalls.h 2017-10-17 10:30:53.039718307 -0700 renamed from arch/x86/include/asm/syscalls.h~x86-syscall-macros-modify_ldt 2017-10-17 10:30:53.032718307 -0700 +1
-1@@ -21,7 +21,7 @@ asmlinkage long sys_ioperm(unsigned long asmlinkage long sys_iopl(unsigned int); /* kernel/ldt.c */ -asmlinkage int sys_modify_ldt(int, void __user *, unsigned long); +asmlinkage long sys_modify_ldt(int, void __user *, unsigned long); /* kernel/signal.c */ asmlinkage long sys_rt_sigreturn(void);diff -puN
arch/x86/kernel/ldt.c~x86-syscall-macros-modify_ldtarch/x86/kernel/ldt.carch/x86/kernel/ldt.c 2017-10-17 12:02:51.137704545 -0700 renamed from arch/x86/kernel/ldt.c~x86-syscall-macros-modify_ldt 2017-10-17 10:30:53.034718307 -0700 +13
-3@@ -12,6 +12,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/smp.h> +#include <linux/syscalls.h> #include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/uaccess.h>@@ -294,8 +295,8 @@ out: return error; } -asmlinkage int sys_modify_ldt(int func, void __user *ptr, - unsigned long bytecount) +SYSCALL_DEFINE3(modify_ldt, int , func , void __user * , ptr , + unsigned long , bytecount) { int ret = -ENOSYS;@@ -313,5 +314,14 @@ asmlinkage int sys_modify_ldt(int func, ret = write_ldt(ptr, bytecount, 0); break; } - return ret; + /* + * The SYSCALL_DEFINE() macros give us an 'unsigned long' + * return type, but tht ABI for sys_modify_ldt() expects + * 'int'. This cast gives us an int-sized value in %rax + * for the return code. The 'unsigned' is necessary so + * the compiler does not try to sign-extend the negative + * return codes into the high half of the register when + * taking the value from int->long. + */ + return (unsigned int)ret; }diff -puN
arch/x86/um/ldt.c~x86-syscall-macros-modify_ldtarch/x86/um/ldt.carch/x86/um/ldt.c 2017-10-17 10:58:58.711714103 -0700 renamed from arch/x86/um/ldt.c~x86-syscall-macros-modify_ldt 2017-10-17 10:30:53.036718307 -0700 +4
-2@@ -369,7 +369,9 @@ void free_ldt(struct mm_context *mm) mm->arch.ldt.entry_count = 0; } -int sys_modify_ldt(int func, void __user *ptr, unsigned long bytecount) +SYSCALL_DEFINE3(modify_ldt, int , func , void __user * , ptr , + unsigned long , bytecount) { - return do_modify_ldt_skas(func, ptr, bytecount); + /* See non-um modify_ldt() for why we do this cast */ + return (unsigned int)do_modify_ldt_skas(func, ptr, bytecount); }_
Quoted 13 lines · Dave Hansen
We do not have tracepoints for
sys_modify_ldt()because we define it directly instead of using the normalSYSCALL_DEFINEx()macros.However, there is a reason
sys_modify_ldt()does not use the macros:
it has an 'int' return type instead of 'unsigned long'. This is a bug, but it's a bug cemented in the ABI.What does this mean? If we return
-EINVALfrom a function that returns 'int', we have0x00000000ffffffeain %rax. But, if we return-EINVALfrom a function returning 'unsigned long', we end up with0xffffffffffffffeain %rax, which is wrong.
Quoted 7 lines
To work around this and maintain the 'int' behavior while using the
SYSCALL_DEFINEx()macros, so we add a cast to 'unsigned int' in both implementations ofsys_modify_ldt().
I have added your:
let me know if that's OK.
Thanks,
Ingo
Dave Hansen
maintainerQuoted 5 lines · Ingo Molnar
I have added your:
Signed-off-by Dave Hansen <[email protected]>let me know if that's OK.
Yes, that's OK.
Quoted 8 lines · Dave Hansen
We do not have tracepoints for
sys_modify_ldt()because we define it directly instead of using the normalSYSCALL_DEFINEx()macros.However, there is a reason
sys_modify_ldt()does not use the macros:
it has an 'int' return type instead of 'unsigned long'. This is a bug, but it's a bug cemented in the ABI.
Quoted 8 lines
What does this mean? If we return
-EINVALfrom a function that returns 'int', we have0x00000000ffffffeain %rax. But, if we return-EINVALfrom a function returning 'unsigned long', we end up with0xffffffffffffffeain %rax, which is wrong.To work around this and maintain the 'int' behavior while using the
SYSCALL_DEFINEx()macros, so we add a cast to 'unsigned int' in both implementations ofsys_modify_ldt().
Quoted 21 lines · Dave Hansen
We do not have tracepoints for
sys_modify_ldt()because we define it directly instead of using the normalSYSCALL_DEFINEx()macros.However, there is a reason
sys_modify_ldt()does not use the macros:
it has an 'int' return type instead of 'unsigned long'. This is a bug, but it's a bug cemented in the ABI.What does this mean? If we return
-EINVALfrom a function that returns 'int', we have0x00000000ffffffeain %rax. But, if we return-EINVALfrom a function returning 'unsigned long', we end up with0xffffffffffffffeain %rax, which is wrong.To work around this and maintain the 'int' behavior while using the
SYSCALL_DEFINEx()macros, so we add a cast to 'unsigned int' in both implementations ofsys_modify_ldt().
Quoted 6 lines
---
b/arch/x86/include/asm/syscalls.h | 2 +- b/arch/x86/kernel/ldt.c | 16 +++++++++++++--- b/arch/x86/um/ldt.c | 6 ++++-- 3 files changed, 18 insertions(+), 6 deletions(-)
Fails to build on UML:
/home/mingo/tip/arch/x86/um/ldt.c:372:29: error: expected ‘)’ before ‘int’
SYSCALL_DEFINE3(modify_ldt, int , func , void __user * , ptr ,
^
/home/mingo/tip/arch/x86/um/ldt.c:206:13: warning: ‘do_modify_ldt_skas’ defined but not used [-Wunused-function]
static long do_modify_ldt_skas(int func, void __user *ptr,
etc.
Thanks,
Ingo