| Message ID | 1412243176-16192-6-git-send-email-takahiro.akashi@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Thu, Oct 02, 2014 at 10:46:15AM +0100, AKASHI Takahiro wrote: > SIGSYS is primarily used in secure computing to notify tracer. > This patch allows signal handler on compat task to get correct information > with SA_SIGINFO specified when this signal is delivered. > > Reviewed-by: Kees Cook <keescook@chromium.org> > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> > --- > arch/arm64/include/asm/compat.h | 7 +++++++ > arch/arm64/kernel/signal32.c | 6 ++++++ > 2 files changed, 13 insertions(+) > > diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h > index 253e33b..c877915 100644 > --- a/arch/arm64/include/asm/compat.h > +++ b/arch/arm64/include/asm/compat.h > @@ -205,6 +205,13 @@ typedef struct compat_siginfo { > compat_long_t _band; /* POLL_IN, POLL_OUT, POLL_MSG */ > int _fd; > } _sigpoll; > + > + /* SIGSYS */ > + struct { > + compat_uptr_t _call_addr; /* calling user insn */ > + int _syscall; /* triggering system call number */ > + unsigned int _arch; /* AUDIT_ARCH_* of syscall */ nit, but compat_uint_t looks better here (I have no idea why I didn't do this for the signed int types, but hey). Will -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On 10/08/2014 11:30 PM, Will Deacon wrote: > On Thu, Oct 02, 2014 at 10:46:15AM +0100, AKASHI Takahiro wrote: >> SIGSYS is primarily used in secure computing to notify tracer. >> This patch allows signal handler on compat task to get correct information >> with SA_SIGINFO specified when this signal is delivered. >> >> Reviewed-by: Kees Cook <keescook@chromium.org> >> Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> >> --- >> arch/arm64/include/asm/compat.h | 7 +++++++ >> arch/arm64/kernel/signal32.c | 6 ++++++ >> 2 files changed, 13 insertions(+) >> >> diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h >> index 253e33b..c877915 100644 >> --- a/arch/arm64/include/asm/compat.h >> +++ b/arch/arm64/include/asm/compat.h >> @@ -205,6 +205,13 @@ typedef struct compat_siginfo { >> compat_long_t _band; /* POLL_IN, POLL_OUT, POLL_MSG */ >> int _fd; >> } _sigpoll; >> + >> + /* SIGSYS */ >> + struct { >> + compat_uptr_t _call_addr; /* calling user insn */ >> + int _syscall; /* triggering system call number */ >> + unsigned int _arch; /* AUDIT_ARCH_* of syscall */ > > nit, but compat_uint_t looks better here (I have no idea why I didn't do > this for the signed int types, but hey). I will fix it. -Takahiro AKASHI > Will > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index 253e33b..c877915 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -205,6 +205,13 @@ typedef struct compat_siginfo { compat_long_t _band; /* POLL_IN, POLL_OUT, POLL_MSG */ int _fd; } _sigpoll; + + /* SIGSYS */ + struct { + compat_uptr_t _call_addr; /* calling user insn */ + int _syscall; /* triggering system call number */ + unsigned int _arch; /* AUDIT_ARCH_* of syscall */ + } _sigsys; } _sifields; } compat_siginfo_t; diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c index 1b9ad02..5a1ba6e 100644 --- a/arch/arm64/kernel/signal32.c +++ b/arch/arm64/kernel/signal32.c @@ -186,6 +186,12 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from) err |= __put_user(from->si_uid, &to->si_uid); err |= __put_user((compat_uptr_t)(unsigned long)from->si_ptr, &to->si_ptr); break; + case __SI_SYS: + err |= __put_user((compat_uptr_t)(unsigned long) + from->si_call_addr, &to->si_call_addr); + err |= __put_user(from->si_syscall, &to->si_syscall); + err |= __put_user(from->si_arch, &to->si_arch); + break; default: /* this is just in case for now ... */ err |= __put_user(from->si_pid, &to->si_pid); err |= __put_user(from->si_uid, &to->si_uid);