1 files changed, 53 insertions, 1 deletions

diff --git a/test/syscalls/linux/getdents.cc b/test/syscalls/linux/getdents.cc
index d146c8db7..fe9cfafe8 100644
--- a/test/syscalls/linux/getdents.cc
+++ b/test/syscalls/linux/getdents.cc
@@ -40,6 +40,7 @@
 #include "test/util/temp_path.h"
 #include "test/util/test_util.h"
 
+using ::testing::Contains;
 using ::testing::IsEmpty;
 using ::testing::IsSupersetOf;
 using ::testing::Not;
@@ -364,7 +365,7 @@ TYPED_TEST(GetdentsTest, PartialBuffer) {
 }
 
 // Open many file descriptors, then scan through /proc/self/fd to find and close
-// them all. (The latter is commonly used to handle races betweek fork/execve
+// them all. (The latter is commonly used to handle races between fork/execve
 // and the creation of unwanted non-O_CLOEXEC file descriptors.) This tests that
 // getdents iterates correctly despite mutation of /proc/self/fd.
 TYPED_TEST(GetdentsTest, ProcSelfFd) {
@@ -437,6 +438,19 @@ TYPED_TEST(GetdentsTest, SeekResetsCursor) {
   EXPECT_EQ(expect, this->ReadAndCountAllEntries(&dirents));
 }
 
+// Test that getdents() after SEEK_END succeeds.
+// This is a regression test for #128.
+TYPED_TEST(GetdentsTest, Issue128ProcSeekEnd) {
+  auto fd =
+      ASSERT_NO_ERRNO_AND_VALUE(Open("/proc/self", O_RDONLY | O_DIRECTORY));
+  typename TestFixture::DirentBufferType dirents(256);
+
+  ASSERT_THAT(lseek(fd.get(), 0, SEEK_END), SyscallSucceeds());
+  ASSERT_THAT(RetryEINTR(syscall)(this->SyscallNum(), fd.get(), dirents.Data(),
+                                  dirents.Size()),
+              SyscallSucceeds());
+}
+
 // Some tests using the glibc readdir interface.
 TEST(ReaddirTest, OpenDir) {
   DIR* dev;
@@ -471,6 +485,44 @@ TEST(ReaddirTest, Bug35110122Root) {
   EXPECT_THAT(contents, Not(IsEmpty()));
 }
 
+// Unlink should invalidate getdents cache.
+TEST(ReaddirTest, GoneAfterRemoveCache) {
+  TempPath dir = ASSERT_NO_ERRNO_AND_VALUE(TempPath::CreateDir());
+  TempPath file = ASSERT_NO_ERRNO_AND_VALUE(TempPath::CreateFileIn(dir.path()));
+  std::string name = std::string(Basename(file.path()));
+
+  auto contents = ASSERT_NO_ERRNO_AND_VALUE(ListDir(dir.path(), true));
+  EXPECT_THAT(contents, Contains(name));
+
+  file.reset();
+
+  contents = ASSERT_NO_ERRNO_AND_VALUE(ListDir(dir.path(), true));
+  EXPECT_THAT(contents, Not(Contains(name)));
+}
+
+// Regression test for b/137398511. Rename should invalidate getdents cache.
+TEST(ReaddirTest, GoneAfterRenameCache) {
+  TempPath src = ASSERT_NO_ERRNO_AND_VALUE(TempPath::CreateDir());
+  TempPath dst = ASSERT_NO_ERRNO_AND_VALUE(TempPath::CreateDir());
+
+  TempPath file = ASSERT_NO_ERRNO_AND_VALUE(TempPath::CreateFileIn(src.path()));
+  std::string name = std::string(Basename(file.path()));
+
+  auto contents = ASSERT_NO_ERRNO_AND_VALUE(ListDir(src.path(), true));
+  EXPECT_THAT(contents, Contains(name));
+
+  ASSERT_THAT(rename(file.path().c_str(), JoinPath(dst.path(), name).c_str()),
+              SyscallSucceeds());
+  // Release file since it was renamed. dst cleanup will ultimately delete it.
+  file.release();
+
+  contents = ASSERT_NO_ERRNO_AND_VALUE(ListDir(src.path(), true));
+  EXPECT_THAT(contents, Not(Contains(name)));
+
+  contents = ASSERT_NO_ERRNO_AND_VALUE(ListDir(dst.path(), true));
+  EXPECT_THAT(contents, Contains(name));
+}
+
 }  // namespace
 
 }  // namespace testing