Commit 107c948d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'seccomp-v5.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull seccomp selftest fix from Kees Cook:

 - Avoid using stdin for read syscall testing (Jann Horn)

* tag 'seccomp-v5.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  selftests/seccomp: Don't call read() on TTY from background pgrp
parents ef8e4d3c 2bfed7d2

tools/testing/selftests/seccomp/seccomp_bpf.c

+5 −5
Original line number Diff line number Diff line
@@ -955,7 +955,7 @@ TEST(ERRNO_valid) 
	ASSERT_EQ(0, ret);



	EXPECT_EQ(parent, syscall(__NR_getppid));

	EXPECT_EQ(-1, read(0, NULL, 0));

	EXPECT_EQ(-1, read(-1, NULL, 0));

	EXPECT_EQ(E2BIG, errno);

}
@@ -974,7 +974,7 @@ TEST(ERRNO_zero) 


	EXPECT_EQ(parent, syscall(__NR_getppid));

	/* "errno" of 0 is ok. */

	EXPECT_EQ(0, read(0, NULL, 0));

	EXPECT_EQ(0, read(-1, NULL, 0));

}



/*
@@ -995,7 +995,7 @@ TEST(ERRNO_capped) 
	ASSERT_EQ(0, ret);



	EXPECT_EQ(parent, syscall(__NR_getppid));

	EXPECT_EQ(-1, read(0, NULL, 0));

	EXPECT_EQ(-1, read(-1, NULL, 0));

	EXPECT_EQ(4095, errno);

}
@@ -1026,7 +1026,7 @@ TEST(ERRNO_order) 
	ASSERT_EQ(0, ret);



	EXPECT_EQ(parent, syscall(__NR_getppid));

	EXPECT_EQ(-1, read(0, NULL, 0));

	EXPECT_EQ(-1, read(-1, NULL, 0));

	EXPECT_EQ(12, errno);

}
@@ -2623,7 +2623,7 @@ void *tsync_sibling(void *data) 
	ret = prctl(PR_GET_NO_NEW_PRIVS, 0, 0, 0, 0);

	if (!ret)

		return (void *)SIBLING_EXIT_NEWPRIVS;

	read(0, NULL, 0);

	read(-1, NULL, 0);

	return (void *)SIBLING_EXIT_UNKILLED;

}