Skip to content

Commit 107c948

Browse files
committed
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
2 parents ef8e4d3 + 2bfed7d commit 107c948

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tools/testing/selftests/seccomp/seccomp_bpf.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ TEST(ERRNO_valid)
955955
ASSERT_EQ(0, ret);
956956

957957
EXPECT_EQ(parent, syscall(__NR_getppid));
958-
EXPECT_EQ(-1, read(0, NULL, 0));
958+
EXPECT_EQ(-1, read(-1, NULL, 0));
959959
EXPECT_EQ(E2BIG, errno);
960960
}
961961

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

975975
EXPECT_EQ(parent, syscall(__NR_getppid));
976976
/* "errno" of 0 is ok. */
977-
EXPECT_EQ(0, read(0, NULL, 0));
977+
EXPECT_EQ(0, read(-1, NULL, 0));
978978
}
979979

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

997997
EXPECT_EQ(parent, syscall(__NR_getppid));
998-
EXPECT_EQ(-1, read(0, NULL, 0));
998+
EXPECT_EQ(-1, read(-1, NULL, 0));
999999
EXPECT_EQ(4095, errno);
10001000
}
10011001

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

10281028
EXPECT_EQ(parent, syscall(__NR_getppid));
1029-
EXPECT_EQ(-1, read(0, NULL, 0));
1029+
EXPECT_EQ(-1, read(-1, NULL, 0));
10301030
EXPECT_EQ(12, errno);
10311031
}
10321032

@@ -2623,7 +2623,7 @@ void *tsync_sibling(void *data)
26232623
ret = prctl(PR_GET_NO_NEW_PRIVS, 0, 0, 0, 0);
26242624
if (!ret)
26252625
return (void *)SIBLING_EXIT_NEWPRIVS;
2626-
read(0, NULL, 0);
2626+
read(-1, NULL, 0);
26272627
return (void *)SIBLING_EXIT_UNKILLED;
26282628
}
26292629

0 commit comments

Comments
 (0)