selftests/x86/vdso: Fix no-vDSO segfaults (07f24dc9) · Commits · 戴 / test

tools/testing/selftests/x86/test_vdso.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -259,6 +259,11 @@ static void test_one_clock_gettime(int clock, const char *name)

		static void test_clock_gettime(void)
		{
		if (!vdso_clock_gettime) {
		printf("[SKIP]\tNo vDSO, so skipping clock_gettime() tests\n");
		return;
		}

		for (int clock = 0; clock < sizeof(clocknames) / sizeof(clocknames[0]);
		clock++) {
		test_one_clock_gettime(clock, clocknames[clock]);

+15 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@

		#include <err.h>
		#include <stdio.h>
		#include <dlfcn.h>
		#include <string.h>
		#include <signal.h>
		#include <unistd.h>
		@@ -46,11 +47,23 @@ int main()
		int nerrs = 0;
		struct real_sigaction sa;

		void *vdso = dlopen("linux-vdso.so.1",
		RTLD_LAZY \| RTLD_LOCAL \| RTLD_NOLOAD);
		if (!vdso)
		vdso = dlopen("linux-gate.so.1",
		RTLD_LAZY \| RTLD_LOCAL \| RTLD_NOLOAD);
		if (!vdso) {
		printf("[SKIP]\tFailed to find vDSO. Tests are not expected to work.\n");
		return 0;
		}

		memset(&sa, 0, sizeof(sa));
		sa.handler = handler_with_siginfo;
		sa.flags = SA_SIGINFO;
		sa.restorer = NULL; /* request kernel-provided restorer */

		printf("[RUN]\tRaise a signal, SA_SIGINFO, sa.restorer == NULL\n");

		if (syscall(SYS_rt_sigaction, SIGUSR1, &sa, NULL, 8) != 0)
		err(1, "raw rt_sigaction syscall");

		@@ -63,6 +76,8 @@ int main()
		nerrs++;
		}

		printf("[RUN]\tRaise a signal, !SA_SIGINFO, sa.restorer == NULL\n");

		sa.flags = 0;
		sa.handler = handler_without_siginfo;
		if (syscall(SYS_sigaction, SIGUSR1, &sa, 0) != 0)