1 files changed, 20 insertions, 3 deletions
diff --git a/test/syscalls/linux/proc.cc b/test/syscalls/linux/proc.cc
index 9e48fbca5..24928d876 100644
--- a/test/syscalls/linux/proc.cc
+++ b/test/syscalls/linux/proc.cc
@@ -1201,6 +1201,15 @@ TEST(ProcSelfCwd, Absolute) {
   EXPECT_EQ(exe[0], '/');
 }
 
+// Sanity check that /proc/cmdline is present.
+TEST(ProcCmdline, IsPresent) {
+  SKIP_IF(IsRunningWithVFS1());
+
+  std::string proc_cmdline =
+      ASSERT_NO_ERRNO_AND_VALUE(GetContents("/proc/cmdline"));
+  ASSERT_FALSE(proc_cmdline.empty());
+}
+
 // Sanity check for /proc/cpuinfo fields that must be present.
 TEST(ProcCpuinfo, RequiredFieldsArePresent) {
   std::string proc_cpuinfo =
@@ -1849,8 +1858,8 @@ TEST(ProcPidSymlink, SubprocessRunning) {
 }
 
 TEST(ProcPidSymlink, SubprocessZombied) {
-  ASSERT_NO_ERRNO(SetCapability(CAP_DAC_OVERRIDE, false));
-  ASSERT_NO_ERRNO(SetCapability(CAP_DAC_READ_SEARCH, false));
+  AutoCapability cap1(CAP_DAC_OVERRIDE, false);
+  AutoCapability cap2(CAP_DAC_READ_SEARCH, false);
 
   char buf[1];
 
@@ -2252,7 +2261,7 @@ TEST(ProcTask, VerifyTaskDir) {
 
 TEST(ProcTask, TaskDirCannotBeDeleted) {
   // Drop capabilities that allow us to override file and directory permissions.
-  ASSERT_NO_ERRNO(SetCapability(CAP_DAC_OVERRIDE, false));
+  AutoCapability cap(CAP_DAC_OVERRIDE, false);
 
   EXPECT_THAT(rmdir("/proc/self/task"), SyscallFails());
   EXPECT_THAT(rmdir(absl::StrCat("/proc/self/task/", getpid()).c_str()),
@@ -2698,6 +2707,14 @@ TEST(Proc, Statfs) {
   EXPECT_EQ(st.f_namelen, NAME_MAX);
 }
 
+// Tests that /proc/[pid]/fd/[num] can resolve to a path inside /proc.
+TEST(Proc, ResolveSymlinkToProc) {
+  const auto proc = ASSERT_NO_ERRNO_AND_VALUE(Open("/proc/self/cmdline", 0));
+  const auto path = JoinPath("/proc/self/fd/", absl::StrCat(proc.get()));
+  const auto target = ASSERT_NO_ERRNO_AND_VALUE(ReadLink(path));
+  EXPECT_EQ(target, JoinPath("/proc/", absl::StrCat(getpid()), "/cmdline"));
+}
+
 }  // namespace
 }  // namespace testing
 }  // namespace gvisor