diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-12-03 15:42:13 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-12-03 15:44:09 -0800 |
| commit | 55fd59b003f6e8fd88cf16590e79823d7ccf3026 (patch) | |
| tree | f23b2225f1a00b80632d612428708d5a57ad330b /lib | |
| parent | a4390e966f952510808b10ce7ae2a7dd2a08c0e5 (diff) | |
| parent | bbe2ba04c5a92a49db8a42c850a5a2f6481e47eb (diff) | |
| download | linux-55fd59b003f6e8fd88cf16590e79823d7ccf3026.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
drivers/net/ethernet/ibm/ibmvnic.c
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/syscall.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/syscall.c b/lib/syscall.c index 8533d2fea2d7..ba13e924c430 100644 --- a/lib/syscall.c +++ b/lib/syscall.c @@ -7,6 +7,7 @@ static int collect_syscall(struct task_struct *target, struct syscall_info *info) { + unsigned long args[6] = { }; struct pt_regs *regs; if (!try_get_task_stack(target)) { @@ -27,8 +28,14 @@ static int collect_syscall(struct task_struct *target, struct syscall_info *info info->data.nr = syscall_get_nr(target, regs); if (info->data.nr != -1L) - syscall_get_arguments(target, regs, - (unsigned long *)&info->data.args[0]); + syscall_get_arguments(target, regs, args); + + info->data.args[0] = args[0]; + info->data.args[1] = args[1]; + info->data.args[2] = args[2]; + info->data.args[3] = args[3]; + info->data.args[4] = args[4]; + info->data.args[5] = args[5]; put_task_stack(target); return 0; |