3 files changed, 11 insertions, 5 deletions
diff --git a/pkg/sentry/fsimpl/gofer/special_file.go b/pkg/sentry/fsimpl/gofer/special_file.go
index 089955a96..ae972fcb5 100644
--- a/pkg/sentry/fsimpl/gofer/special_file.go
+++ b/pkg/sentry/fsimpl/gofer/special_file.go
@@ -299,10 +299,15 @@ func (fd *specialFileFD) pwrite(ctx context.Context, src usermem.IOSequence, off
 		src = src.TakeFirst64(limit)
 	}
 
-	// Do a buffered write. See rationale in PRead.
 	if d.cachedMetadataAuthoritative() {
-		d.touchCMtime()
+		if fd.isRegularFile {
+			d.touchCMtimeLocked()
+		} else {
+			d.touchCMtime()
+		}
 	}
+
+	// Do a buffered write. See rationale in PRead.
 	buf := make([]byte, src.NumBytes())
 	copied, copyErr := src.CopyIn(ctx, buf)
 	if copied == 0 && copyErr != nil {
diff --git a/pkg/sentry/fsimpl/host/socket.go b/pkg/sentry/fsimpl/host/socket.go
index 60acc367f..72aa535f8 100644
--- a/pkg/sentry/fsimpl/host/socket.go
+++ b/pkg/sentry/fsimpl/host/socket.go
@@ -201,7 +201,7 @@ func (c *ConnectedEndpoint) Passcred() bool {
 }
 
 // GetLocalAddress implements transport.ConnectedEndpoint.GetLocalAddress.
-func (c *ConnectedEndpoint) GetLocalAddress() (tcpip.FullAddress, *tcpip.Error) {
+func (c *ConnectedEndpoint) GetLocalAddress() (tcpip.FullAddress, tcpip.Error) {
 	return tcpip.FullAddress{Addr: tcpip.Address(c.addr)}, nil
 }
 
diff --git a/pkg/sentry/fsimpl/kernfs/inode_impl_util.go b/pkg/sentry/fsimpl/kernfs/inode_impl_util.go
index eac578f25..8139bff76 100644
--- a/pkg/sentry/fsimpl/kernfs/inode_impl_util.go
+++ b/pkg/sentry/fsimpl/kernfs/inode_impl_util.go
@@ -371,6 +371,8 @@ type OrderedChildrenOptions struct {
 	// OrderedChildren may modify the tracked children. This applies to
 	// operations related to rename, unlink and rmdir. If an OrderedChildren is
 	// not writable, these operations all fail with EPERM.
+	//
+	// Note that writable users must implement the sticky bit (I_SVTX).
 	Writable bool
 }
 
@@ -556,7 +558,6 @@ func (o *OrderedChildren) Unlink(ctx context.Context, name string, child Inode)
 		return err
 	}
 
-	// TODO(gvisor.dev/issue/3027): Check sticky bit before removing.
 	o.removeLocked(name)
 	return nil
 }
@@ -603,8 +604,8 @@ func (o *OrderedChildren) Rename(ctx context.Context, oldname, newname string, c
 	if err := o.checkExistingLocked(oldname, child); err != nil {
 		return err
 	}
+	o.removeLocked(oldname)
 
-	// TODO(gvisor.dev/issue/3027): Check sticky bit before removing.
 	dst.replaceChildLocked(ctx, newname, child)
 	return nil
 }