From 96bd076e8a002ccacc414e92c83dedf2e35ca07b Mon Sep 17 00:00:00 2001
From: Dean Deng <deandeng@google.com>
Date: Tue, 26 Jan 2021 12:00:04 -0800
Subject: [PATCH] Initialize timestamps for gofer synthetic children.

Contrary to the comment on the socket test, the failure was due to an issue
with goferfs rather than kernfs.

PiperOrigin-RevId: 353918021
---
 pkg/sentry/fsimpl/gofer/directory.go | 5 +++++
 test/syscalls/linux/socket.cc        | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkg/sentry/fsimpl/gofer/directory.go b/pkg/sentry/fsimpl/gofer/directory.go
index 3b5927702..9da01cba3 100644
--- a/pkg/sentry/fsimpl/gofer/directory.go
+++ b/pkg/sentry/fsimpl/gofer/directory.go
@@ -90,6 +90,7 @@ type createSyntheticOpts struct {
 // * d.isDir().
 // * d does not already contain a child with the given name.
 func (d *dentry) createSyntheticChildLocked(opts *createSyntheticOpts) {
+	now := d.fs.clock.Now().Nanoseconds()
 	child := &dentry{
 		refs:      1, // held by d
 		fs:        d.fs,
@@ -98,6 +99,10 @@ func (d *dentry) createSyntheticChildLocked(opts *createSyntheticOpts) {
 		uid:       uint32(opts.kuid),
 		gid:       uint32(opts.kgid),
 		blockSize: usermem.PageSize, // arbitrary
+		atime:     now,
+		mtime:     now,
+		ctime:     now,
+		btime:     now,
 		readFD:    -1,
 		writeFD:   -1,
 		mmapFD:    -1,
diff --git a/test/syscalls/linux/socket.cc b/test/syscalls/linux/socket.cc
index 1af72b159..b616c2c87 100644
--- a/test/syscalls/linux/socket.cc
+++ b/test/syscalls/linux/socket.cc
@@ -91,8 +91,7 @@ TEST(SocketTest, UnixSocketStat) {
   EXPECT_EQ(statbuf.st_mode, S_IFSOCK | (sock_perm & ~mask));
 
   // Timestamps should be equal and non-zero.
-  // TODO(b/158882152): Sockets currently don't implement timestamps.
-  if (!IsRunningOnGvisor()) {
+  if (!IsRunningWithVFS1()) {
     EXPECT_NE(statbuf.st_atime, 0);
     EXPECT_EQ(statbuf.st_atime, statbuf.st_mtime);
     EXPECT_EQ(statbuf.st_atime, statbuf.st_ctime);