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

Commit e52ce61a authored by Daniel Kurtz's avatar Daniel Kurtz
Browse files

Revert "arm64: add SIGSYS siginfo for compat task" 



This reverts commit 17fa5771.

To be replaced with arm64 seccomp from mainline v3.19.

Signed-off-by: default avatarDaniel Kurtz <djkurtz@google.com>
parent 9d2c178a

arch/arm64/include/asm/compat.h

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

arch/arm64/kernel/signal32.c

+0 −8
Original line number Diff line number Diff line
@@ -186,14 +186,6 @@ 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;

#ifdef __ARCH_SIGSYS

	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;

#endif

	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);