arm64: check for number of arguments in syscall_get/set_arguments()
PATCH 1/1 arm64: check for number of arguments in syscall_get/set_arguments()
In ftrace_syscall_enter(),
syscall_get_arguments(..., 0, n, ...)
if (i == 0) { <handle orig_x0> ...; n--;}
memcpy(..., n * sizeof(args[0]));If 'number of arguments(n)' is zero and 'argument index(i)' is also zero in syscall_get_arguments(), none of arguments should be copied by memcpy(). Otherwise 'n--' can be a big positive number and unexpected amount of data will be copied. Tracing system calls which take no argument, say sync(void), may hit this case and eventually make the system corrupted.
This patch fixes the issue both in syscall_get_arguments() and syscall_set_arguments().
Please note, however, that asm-generic/syscall.h says,
* syscall_get_arguments - extract system call parameter values
* @i: argument index [0,5]
* @n: number of arguments; n+i must be [1,6].
and so we'd better change the caller's code(ftrace_syscall_enter).
--- arch/arm64/include/asm/syscall.h | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm64/include/asm/syscall.h +6 -0
@@ -63,6 +63,9 @@ static inline void syscall_get_arguments(struct task_struct *task, unsigned int i, unsigned int n, unsigned long *args) { + if (n == 0) + return; +if (i + n >SYSCALL_MAX_ARGS ) {unsigned long *args_bad = args +SYSCALL_MAX_ARGS - i;unsigned int n_bad = n + i -SYSCALL_MAX_ARGS ;
@@ -86,6 +89,9 @@ static inline void syscall_set_arguments(struct task_struct *task, unsigned int i, unsigned int n, const unsigned long *args) { + if (n == 0) + return; +if (i + n >SYSCALL_MAX_ARGS ) {pr_warning ("%s called with max args %d, handling only %d\n" , __func__, i + n,SYSCALL_MAX_ARGS );
Signature · 1 line
1.7.9.5
PATCH 1/1 arm64: check for number of arguments in syscall_get/set_arguments()
Quoted 12 lines · AKASHI Takahiro
In
ftrace_syscall_enter(),syscall_get_arguments(..., 0, n, ...) if (i == 0) { <handle orig_x0> ...; n--;} memcpy(..., n * sizeof(args[0]));If 'number of arguments(n)' is zero and 'argument index(i)' is also zero in
syscall_get_arguments(), none of arguments should be copied bymemcpy(). Otherwise 'n--' can be a big positive number and unexpected amount of data will be copied. Tracing system calls which take no argument, say sync(void), may hit this case and eventually make the system corrupted.
This patch fixes the issue both insyscall_get_arguments()andsyscall_set_arguments().
Quoted 5 lines
Please note, however, that
asm-generic/syscall.hsays,
*syscall_get_arguments- extract system call parameter values
* @i: argument index [0,5]
* @n: number of arguments; n+i must be [1,6].
and so we'd better change the caller'scode(ftrace_syscall_enter).
Since (most) other architectures deal with n+i == 0, please can you submit a separate patch updating that comment?
Quoted 20 lines
Signed-off-by AKASHI Takahiro <[email protected]>--- arch/arm64/include/asm/syscall.h | 6 ++++++ 1 file changed, 6 insertions(+)arch/arm64/include/asm/syscall.h +3
-0@@ -63,6 +63,9 @@ static inline void syscall_get_arguments(struct task_struct *task, unsigned int i, unsigned int n, unsigned long *args) { + if (n == 0) + return; +if (i + n >SYSCALL_MAX_ARGS ) {unsigned long *args_bad = args +SYSCALL_MAX_ARGS - i;unsigned int n_bad = n + i -SYSCALL_MAX_ARGS ;
arch/arm64/include/asm/syscall.h static inline void syscall_set_arguments(struct task_struct *task, · line 94
Quoted 6 lines
arch/arm64/include/asm/syscall.h +3
-0@@ -86,6 +89,9 @@ static inline void syscall_set_arguments(struct task_struct *task, unsigned int i, unsigned int n, const unsigned long *args) { + if (n == 0) + return; +
Looks sensible. Please can you fix arch/arm/ as well?
Cheers,
Will
PATCH 1/1 arm64: check for number of arguments in syscall_get/set_arguments()
Quoted 13 lines · Will Deacon
Quoted 12 lines · AKASHI Takahiro
In
ftrace_syscall_enter(),syscall_get_arguments(..., 0, n, ...) if (i == 0) { <handle orig_x0> ...; n--;} memcpy(..., n * sizeof(args[0]));If 'number of arguments(n)' is zero and 'argument index(i)' is also zero in
syscall_get_arguments(), none of arguments should be copied bymemcpy(). Otherwise 'n--' can be a big positive number and unexpected amount of data will be copied. Tracing system calls which take no argument, say sync(void), may hit this case and eventually make the system corrupted.
This patch fixes the issue both insyscall_get_arguments()andsyscall_set_arguments().
Quoted 8 lines
Quoted 5 lines
Please note, however, that
asm-generic/syscall.hsays,
*syscall_get_arguments- extract system call parameter values
* @i: argument index [0,5]
* @n: number of arguments; n+i must be [1,6].
and so we'd better change the caller'scode(ftrace_syscall_enter).Since (most) other architectures deal with n+i == 0, please can you submit a separate patch updating that comment?
Yes, I will. But is the patch that only modifies a comment acceptable?
Quoted 20 lines
Quoted 20 lines
Signed-off-by AKASHI Takahiro <[email protected]>--- arch/arm64/include/asm/syscall.h | 6 ++++++ 1 file changed, 6 insertions(+)arch/arm64/include/asm/syscall.h +3
-0@@ -63,6 +63,9 @@ static inline void syscall_get_arguments(struct task_struct *task, unsigned int i, unsigned int n, unsigned long *args) { + if (n == 0) + return; +if (i + n >SYSCALL_MAX_ARGS ) {unsigned long *args_bad = args +SYSCALL_MAX_ARGS - i;unsigned int n_bad = n + i -SYSCALL_MAX_ARGS ;@@ -86,6 +89,9 @@ static inline void syscall_set_arguments(struct task_struct *task,
Quoted 8 lines
arch/arm64/include/asm/syscall.h static inline void syscall_set_arguments(struct task_struct *task, · line 94
Quoted 6 lines
arch/arm64/include/asm/syscall.h +3
-0unsigned int i, unsigned int n, const unsigned long *args) { + if (n == 0) + return; +Looks sensible. Please can you fix
arch/arm/as well?
Yes, I will.
-Takahiro AKASHI
Quoted 4 lines
Cheers,
Will
PATCH 1/1 arm64: check for number of arguments in syscall_get/set_arguments()
Quoted 20 lines · AKASHI Takahiro
Quoted 19 lines · Will Deacon
Quoted 17 lines · AKASHI Takahiro
In
ftrace_syscall_enter(),syscall_get_arguments(..., 0, n, ...) if (i == 0) { <handle orig_x0> ...; n--;} memcpy(..., n * sizeof(args[0]));If 'number of arguments(n)' is zero and 'argument index(i)' is also zero in
syscall_get_arguments(), none of arguments should be copied bymemcpy(). Otherwise 'n--' can be a big positive number and unexpected amount of data will be copied. Tracing system calls which take no argument, say sync(void), may hit this case and eventually make the system corrupted.
This patch fixes the issue both insyscall_get_arguments()andsyscall_set_arguments().Please note, however, that
asm-generic/syscall.hsays,
*syscall_get_arguments- extract system call parameter values
* @i: argument index [0,5]
* @n: number of arguments; n+i must be [1,6].
and so we'd better change the caller'scode(ftrace_syscall_enter).
Quoted 4 lines
Quoted 2 lines
Since (most) other architectures deal with n+i == 0, please can you submit a separate patch updating that comment?
Yes, I will. But is the patch that only modifies a comment acceptable?
Well, if the comment is wrong is should either be fixed or removed. Leaving it alone just serves to confuse other architectures trying to implement the backend API.
Of course, if the comment is *correct*, then the tracer is broken, but we can have that discussion off the back of the patch (just be sure to CC the right people).
Quoted 3 lines
Quoted 1 line
Looks sensible. Please can you fix
arch/arm/as well?Yes, I will.
Thanks!
Will