Commit 2b1e8921 authored by Andrei Vagin's avatar Andrei Vagin Committed by Kees Cook
Browse files

Revert "selftests/timens: add a test for vfork+exit" 



The next patch reverts the code that this test verified.

This reverts commit 6342140d.

Signed-off-by: default avatarAndrei Vagin <avagin@gmail.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20220913102551.1121611-2-avagin@google.com
parent 1c23f9e6

tools/testing/selftests/timens/Makefile

+1 −1
Original line number Diff line number Diff line 
TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs exec futex vfork_exec

TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs exec futex

TEST_GEN_PROGS_EXTENDED := gettime_perf



CFLAGS := -Wall -Werror -pthread

tools/testing/selftests/timens/vfork_exec.c

deleted100644 → 0
+0 −90
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#define _GNU_SOURCE

#include <errno.h>

#include <fcntl.h>

#include <sched.h>

#include <stdio.h>

#include <stdbool.h>

#include <sys/stat.h>

#include <sys/syscall.h>

#include <sys/types.h>

#include <sys/wait.h>

#include <time.h>

#include <unistd.h>

#include <string.h>



#include "log.h"

#include "timens.h"



#define OFFSET (36000)



int main(int argc, char *argv[])

{

	struct timespec now, tst;

	int status, i;

	pid_t pid;



	if (argc > 1) {

		if (sscanf(argv[1], "%ld", &now.tv_sec) != 1)

			return pr_perror("sscanf");



		for (i = 0; i < 2; i++) {

			_gettime(CLOCK_MONOTONIC, &tst, i);

			if (abs(tst.tv_sec - now.tv_sec) > 5)

				return pr_fail("%ld %ld\n", now.tv_sec, tst.tv_sec);

		}

		return 0;

	}



	nscheck();



	ksft_set_plan(1);



	clock_gettime(CLOCK_MONOTONIC, &now);



	if (unshare_timens())

		return 1;



	if (_settime(CLOCK_MONOTONIC, OFFSET))

		return 1;



	for (i = 0; i < 2; i++) {

		_gettime(CLOCK_MONOTONIC, &tst, i);

		if (abs(tst.tv_sec - now.tv_sec) > 5)

			return pr_fail("%ld %ld\n",

					now.tv_sec, tst.tv_sec);

	}



	pid = vfork();

	if (pid < 0)

		return pr_perror("fork");



	if (pid == 0) {

		char now_str[64];

		char *cargv[] = {"exec", now_str, NULL};

		char *cenv[] = {NULL};



		// Check that we are still in the source timens.

		for (i = 0; i < 2; i++) {

			_gettime(CLOCK_MONOTONIC, &tst, i);

			if (abs(tst.tv_sec - now.tv_sec) > 5)

				return pr_fail("%ld %ld\n",

						now.tv_sec, tst.tv_sec);

		}



		/* Check for proper vvar offsets after execve. */

		snprintf(now_str, sizeof(now_str), "%ld", now.tv_sec + OFFSET);

		execve("/proc/self/exe", cargv, cenv);

		return pr_perror("execve");

	}



	if (waitpid(pid, &status, 0) != pid)

		return pr_perror("waitpid");



	if (status)

		ksft_exit_fail();



	ksft_test_result_pass("exec\n");

	ksft_exit_pass();

	return 0;

}