diff options
| author | Patrick Mooney <pmooney@pfmooney.com> | 2016-08-23 03:06:20 +0000 |
|---|---|---|
| committer | Patrick Mooney <pmooney@pfmooney.com> | 2016-09-27 20:20:18 +0000 |
| commit | b7575cc3a38416fc4c39b07c4a05837d19d94d24 (patch) | |
| tree | bcbba1e250f671b3eb81ab4139129df08f5221f9 /usr/src/uts/i86pc/ml | |
| parent | 2c28cf00809579ca407b43967118309562f7a9b4 (diff) | |
| download | illumos-joyent-b7575cc3a38416fc4c39b07c4a05837d19d94d24.tar.gz | |
OS-5612 lxbrand syscalls should not abuse aston()
Reviewed by: Ryan Zezeski <rpz@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Jerry Jelinek <jerry.jelinek@joyent.com>
Diffstat (limited to 'usr/src/uts/i86pc/ml')
| -rw-r--r-- | usr/src/uts/i86pc/ml/syscall_asm_amd64.s | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/usr/src/uts/i86pc/ml/syscall_asm_amd64.s b/usr/src/uts/i86pc/ml/syscall_asm_amd64.s index a4dd2722b6..fb04a9bdfb 100644 --- a/usr/src/uts/i86pc/ml/syscall_asm_amd64.s +++ b/usr/src/uts/i86pc/ml/syscall_asm_amd64.s @@ -531,12 +531,21 @@ noprod_sys_syscall: addq $8, %rsp /* - * If the alternate handler returns 0, we skip straight to the return to - * usermode. Otherwise, we resume regular system call processing. + * If the alternate handler returns non-zero, the normal system call + * processing is resumed. */ testl %eax, %eax popq %rax - jz _syscall_after_brand + jnz _syscall_no_brand + + /* + * For branded syscalls which were handled in-kernel, shuffle the + * register state as would be done by the native handler before jumping + * to the post-syscall logic. + */ + movq REGOFF_RAX(%rsp), %r12 + movq REGOFF_RDX(%rsp), %r13 + jmp _syscall_after_brand _syscall_no_brand: movw %ax, T_SYSNUM(%r15) @@ -831,11 +840,20 @@ _syscall32_save: call *%rax /* - * If the alternate handler returns 0, we skip straight to the return - * to usermode. Otherwise, we resume regular system call processing. + * If the alternate handler returns non-zero, the normal system call + * processing is resumed. */ testl %eax, %eax - jz _syscall32_after_brand + jnz _syscall32_no_brand + + /* + * For branded syscalls which were handled in-kernel, shuffle the + * register state as would be done by the native handler before jumping + * to the post-syscall logic. + */ + movl REGOFF_RAX(%rsp), %r12d + movl REGOFF_RDX(%rsp), %r13d + jmp _syscall32_after_brand _syscall32_no_brand: /* |