Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65714cfa authored by AKASHI Takahiro's avatar AKASHI Takahiro Committed by Daniel Kurtz
Browse files

arm64: add SIGSYS siginfo for compat task 



SIGSYS is primarily used in secure computing to notify tracer of syscall
events. This patch allows signal handler on compat task to get correct
information with SA_SIGINFO specified when this signal is delivered.

Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarAKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
(cherry picked from commit cc5e9097c9aad6b186a568c534e26746d6bfa483)
Signed-off-by: default avatarDaniel Kurtz <djkurtz@google.com>
parent aa1c45e7

arch/arm64/include/asm/compat.h

+7 −0
Original line number Diff line number Diff line
@@ -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 */

			compat_uint_t _arch;	/* AUDIT_ARCH_* of syscall */

		} _sigsys;

	} _sifields;

} compat_siginfo_t;

arch/arm64/kernel/signal32.c

+6 −0
Original line number Diff line number Diff line
@@ -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);