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

Commit 4a0b8807 authored by Mickaël Salaün's avatar Mickaël Salaün Committed by Richard Weinberger
Browse files

selftests/seccomp: Remove the need for HAVE_ARCH_TRACEHOOK 



Some architectures do not implement PTRACE_GETREGSET nor
PTRACE_SETREGSET (required by HAVE_ARCH_TRACEHOOK) but only implement
PTRACE_GETREGS and PTRACE_SETREGS (e.g. User-mode Linux).

This improve seccomp selftest portability for architectures without
HAVE_ARCH_TRACEHOOK support by defining a new trigger HAVE_GETREGS. For
now, this is only enabled for i386 and x86_64 architectures. This is
required to be able to run this tests on User-mode Linux.

Signed-off-by: default avatarMickaël Salaün <mic@digikod.net>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Kees Cook <keescook@chromium.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Will Drewry <wad@chromium.org>
Cc: Shuah Khan <shuahkh@osg.samsung.com>
Cc: Meredydd Luff <meredydd@senatehouse.org>
Cc: David Drysdale <drysdale@google.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Acked-by: default avatarKees Cook <keescook@chromium.org>
parent e04c989e

tools/testing/selftests/seccomp/seccomp_bpf.c

+24 −3
Original line number Diff line number Diff line
@@ -1246,11 +1246,24 @@ TEST_F(TRACE_poke, getpid_runs_normally) 
# error "Do not know how to find your architecture's registers and syscalls"

#endif



/* Use PTRACE_GETREGS and PTRACE_SETREGS when available. This is useful for

 * architectures without HAVE_ARCH_TRACEHOOK (e.g. User-mode Linux).

 */

#if defined(__x86_64__) || defined(__i386__)

#define HAVE_GETREGS

#endif



/* Architecture-specific syscall fetching routine. */

int get_syscall(struct __test_metadata *_metadata, pid_t tracee)

{

	struct iovec iov;

	ARCH_REGS regs;

#ifdef HAVE_GETREGS

	EXPECT_EQ(0, ptrace(PTRACE_GETREGS, tracee, 0, &regs)) {

		TH_LOG("PTRACE_GETREGS failed");

		return -1;

	}

#else

	struct iovec iov;



	iov.iov_base = &regs;

	iov.iov_len = sizeof(regs);
@@ -1258,6 +1271,7 @@ int get_syscall(struct __test_metadata *_metadata, pid_t tracee) 
		TH_LOG("PTRACE_GETREGSET failed");

		return -1;

	}

#endif



	return regs.SYSCALL_NUM;

}
@@ -1266,13 +1280,16 @@ int get_syscall(struct __test_metadata *_metadata, pid_t tracee) 
void change_syscall(struct __test_metadata *_metadata,

		    pid_t tracee, int syscall)

{

	struct iovec iov;

	int ret;

	ARCH_REGS regs;



#ifdef HAVE_GETREGS

	ret = ptrace(PTRACE_GETREGS, tracee, 0, &regs);

#else

	struct iovec iov;

	iov.iov_base = &regs;

	iov.iov_len = sizeof(regs);

	ret = ptrace(PTRACE_GETREGSET, tracee, NT_PRSTATUS, &iov);

#endif

	EXPECT_EQ(0, ret);



#if defined(__x86_64__) || defined(__i386__) || defined(__powerpc__) || \
@@ -1312,9 +1329,13 @@ void change_syscall(struct __test_metadata *_metadata, 
	if (syscall == -1)

		regs.SYSCALL_RET = 1;



#ifdef HAVE_GETREGS

	ret = ptrace(PTRACE_SETREGS, tracee, 0, &regs);

#else

	iov.iov_base = &regs;

	iov.iov_len = sizeof(regs);

	ret = ptrace(PTRACE_SETREGSET, tracee, NT_PRSTATUS, &iov);

#endif

	EXPECT_EQ(0, ret);

}