4 files changed, 38 insertions, 30 deletions
diff --git a/pkg/sentry/fs/dev/tty.go b/pkg/sentry/fs/dev/tty.go
index b4c2a62fd..87d80e292 100644
--- a/pkg/sentry/fs/dev/tty.go
+++ b/pkg/sentry/fs/dev/tty.go
@@ -32,6 +32,7 @@ type ttyInodeOperations struct {
 	fsutil.InodeNoopWriteOut         `state:"nosave"`
 	fsutil.InodeNotDirectory         `state:"nosave"`
 	fsutil.InodeNotMappable          `state:"nosave"`
+	fsutil.InodeNotOpenable          `state:"nosave"`
 	fsutil.InodeNotSocket            `state:"nosave"`
 	fsutil.InodeNotSymlink           `state:"nosave"`
 	fsutil.InodeVirtual              `state:"nosave"`
@@ -47,11 +48,6 @@ func newTTYDevice(ctx context.Context, owner fs.FileOwner, mode linux.FileMode)
 	}
 }
 
-// GetFile implements fs.InodeOperations.GetFile.
-func (*ttyInodeOperations) GetFile(ctx context.Context, dirent *fs.Dirent, flags fs.FileFlags) (*fs.File, error) {
-	return fs.NewFile(ctx, dirent, flags, &ttyFileOperations{}), nil
-}
-
 // +stateify savable
 type ttyFileOperations struct {
 	fsutil.FileNoSeek               `state:"nosave"`
diff --git a/pkg/sentry/fs/inode_overlay.go b/pkg/sentry/fs/inode_overlay.go
index 24b769cfc..e0602da17 100644
--- a/pkg/sentry/fs/inode_overlay.go
+++ b/pkg/sentry/fs/inode_overlay.go
@@ -339,7 +339,9 @@ func overlayRemove(ctx context.Context, o *overlayEntry, parent *Dirent, child *
 		}
 	}
 	if child.Inode.overlay.lowerExists {
-		return overlayCreateWhiteout(o.upper, child.name)
+		if err := overlayCreateWhiteout(o.upper, child.name); err != nil {
+			return err
+		}
 	}
 	// We've removed from the directory so we must drop the cache.
 	o.markDirectoryDirty()
@@ -418,10 +420,12 @@ func overlayRename(ctx context.Context, o *overlayEntry, oldParent *Dirent, rena
 		return err
 	}
 	if renamed.Inode.overlay.lowerExists {
-		return overlayCreateWhiteout(oldParent.Inode.overlay.upper, oldName)
+		if err := overlayCreateWhiteout(oldParent.Inode.overlay.upper, oldName); err != nil {
+			return err
+		}
 	}
 	// We've changed the directory so we must drop the cache.
-	o.markDirectoryDirty()
+	oldParent.Inode.overlay.markDirectoryDirty()
 	return nil
 }
 
diff --git a/pkg/sentry/fs/proc/net.go b/pkg/sentry/fs/proc/net.go
index 37694620c..6b839685b 100644
--- a/pkg/sentry/fs/proc/net.go
+++ b/pkg/sentry/fs/proc/net.go
@@ -155,37 +155,40 @@ func (n *netDev) ReadSeqFileData(ctx context.Context, h seqfile.SeqHandle) ([]se
 	contents[1] = " face |bytes    packets errs drop fifo frame compressed multicast|bytes    packets errs drop fifo colls carrier compressed\n"
 
 	for _, i := range interfaces {
-		// TODO(b/71872867): Collect stats from each inet.Stack
-		// implementation (hostinet, epsocket, and rpcinet).
-
 		// Implements the same format as
 		// net/core/net-procfs.c:dev_seq_printf_stats.
-		l := fmt.Sprintf("%6s: %7d %7d %4d %4d %4d %5d %10d %9d %8d %7d %4d %4d %4d %5d %7d %10d\n",
+		var stats inet.StatDev
+		if err := n.s.Statistics(&stats, i.Name); err != nil {
+			log.Warningf("Failed to retrieve interface statistics for %v: %v", i.Name, err)
+			continue
+		}
+		l := fmt.Sprintf(
+			"%6s: %7d %7d %4d %4d %4d %5d %10d %9d %8d %7d %4d %4d %4d %5d %7d %10d\n",
 			i.Name,
 			// Received
-			0, // bytes
-			0, // packets
-			0, // errors
-			0, // dropped
-			0, // fifo
-			0, // frame
-			0, // compressed
-			0, // multicast
+			stats[0], // bytes
+			stats[1], // packets
+			stats[2], // errors
+			stats[3], // dropped
+			stats[4], // fifo
+			stats[5], // frame
+			stats[6], // compressed
+			stats[7], // multicast
 			// Transmitted
-			0, // bytes
-			0, // packets
-			0, // errors
-			0, // dropped
-			0, // fifo
-			0, // frame
-			0, // compressed
-			0) // multicast
+			stats[8],  // bytes
+			stats[9],  // packets
+			stats[10], // errors
+			stats[11], // dropped
+			stats[12], // fifo
+			stats[13], // frame
+			stats[14], // compressed
+			stats[15]) // multicast
 		contents = append(contents, l)
 	}
 
 	var data []seqfile.SeqData
 	for _, l := range contents {
-		data = append(data, seqfile.SeqData{Buf: []byte(l), Handle: (*ifinet6)(nil)})
+		data = append(data, seqfile.SeqData{Buf: []byte(l), Handle: (*netDev)(nil)})
 	}
 
 	return data, 0
diff --git a/pkg/sentry/fs/proc/task.go b/pkg/sentry/fs/proc/task.go
index ef0ca3301..87184ec67 100644
--- a/pkg/sentry/fs/proc/task.go
+++ b/pkg/sentry/fs/proc/task.go
@@ -162,6 +162,11 @@ func (f *subtasksFile) Readdir(ctx context.Context, file *fs.File, ser fs.Dentry
 	// subtask to emit.
 	offset := file.Offset()
 
+	tasks := f.t.ThreadGroup().MemberIDs(f.pidns)
+	if len(tasks) == 0 {
+		return offset, syserror.ENOENT
+	}
+
 	if offset == 0 {
 		// Serialize "." and "..".
 		root := fs.RootFromContext(ctx)
@@ -178,12 +183,12 @@ func (f *subtasksFile) Readdir(ctx context.Context, file *fs.File, ser fs.Dentry
 	}
 
 	// Serialize tasks.
-	tasks := f.t.ThreadGroup().MemberIDs(f.pidns)
 	taskInts := make([]int, 0, len(tasks))
 	for _, tid := range tasks {
 		taskInts = append(taskInts, int(tid))
 	}
 
+	sort.Sort(sort.IntSlice(taskInts))
 	// Find the task to start at.
 	idx := sort.SearchInts(taskInts, int(offset))
 	if idx == len(taskInts) {