summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/fs/proc/proc.go
diff options
context:
space:
mode:
authorBrian Geffon <bgeffon@google.com>2018-06-05 15:43:55 -0700
committerShentubot <shentubot@google.com>2018-06-05 15:45:35 -0700
commitff7b4a156f95a587b5df4de89a22c200fceabb96 (patch)
treedbf2206d66db40f71c1d92784cbc60126a59e1d3 /pkg/sentry/fs/proc/proc.go
parent343020ca275298fe9ea3320628454cad5f0052aa (diff)
Add support for rpcinet owned procfs files.
This change will add support for /proc/sys/net and /proc/net which will be managed and owned by rpcinet. This will allow these inodes to be forward as rpcs. PiperOrigin-RevId: 199370799 Change-Id: I2c876005d98fe55dd126145163bee5a645458ce4
Diffstat (limited to 'pkg/sentry/fs/proc/proc.go')
-rw-r--r--pkg/sentry/fs/proc/proc.go45
1 files changed, 44 insertions, 1 deletions
diff --git a/pkg/sentry/fs/proc/proc.go b/pkg/sentry/fs/proc/proc.go
index 459eb7e62..d727e1bc9 100644
--- a/pkg/sentry/fs/proc/proc.go
+++ b/pkg/sentry/fs/proc/proc.go
@@ -17,6 +17,7 @@ package proc
import (
"fmt"
+ "io"
"sort"
"strconv"
@@ -26,6 +27,9 @@ import (
"gvisor.googlesource.com/gvisor/pkg/sentry/fs/proc/seqfile"
"gvisor.googlesource.com/gvisor/pkg/sentry/fs/ramfs"
"gvisor.googlesource.com/gvisor/pkg/sentry/kernel"
+ "gvisor.googlesource.com/gvisor/pkg/sentry/socket/rpcinet"
+ "gvisor.googlesource.com/gvisor/pkg/sentry/usermem"
+ "gvisor.googlesource.com/gvisor/pkg/syserror"
)
// proc is a root proc node.
@@ -40,6 +44,30 @@ type proc struct {
pidns *kernel.PIDNamespace
}
+// stubProcFSFile is a file type that can be used to return file contents
+// which are constant. This file is not writable and will always have mode
+// 0444.
+type stubProcFSFile struct {
+ ramfs.Entry
+
+ // contents are the immutable file contents that will always be returned.
+ contents []byte
+}
+
+// DeprecatedPreadv implements fs.InodeOperations.DeprecatedPreadv.
+func (s *stubProcFSFile) DeprecatedPreadv(ctx context.Context, dst usermem.IOSequence, offset int64) (int64, error) {
+ if offset < 0 {
+ return 0, syserror.EINVAL
+ }
+
+ if offset >= int64(len(s.contents)) {
+ return 0, io.EOF
+ }
+
+ n, err := dst.CopyOut(ctx, s.contents[offset:])
+ return int64(n), err
+}
+
// New returns the root node of a partial simple procfs.
func New(ctx context.Context, msrc *fs.MountSource) (*fs.Inode, error) {
k := kernel.KernelFromContext(ctx)
@@ -83,6 +111,15 @@ func (p *proc) newSelf(ctx context.Context, msrc *fs.MountSource) *fs.Inode {
return newFile(s, msrc, fs.Symlink, nil)
}
+// newStubProcFsFile returns a procfs file with constant contents.
+func (p *proc) newStubProcFSFile(ctx context.Context, msrc *fs.MountSource, c []byte) *fs.Inode {
+ u := &stubProcFSFile{
+ contents: c,
+ }
+ u.InitEntry(ctx, fs.RootOwner, fs.FilePermsFromMode(0444))
+ return newFile(u, msrc, fs.SpecialFile, nil)
+}
+
// Readlink implements fs.InodeOperations.Readlink.
func (s *self) Readlink(ctx context.Context, inode *fs.Inode) (string, error) {
if t := kernel.TaskFromContext(ctx); t != nil {
@@ -107,7 +144,13 @@ func (p *proc) Lookup(ctx context.Context, dir *fs.Inode, name string) (*fs.Dire
// Is it a dynamic element?
nfs := map[string]func() *fs.Inode{
- "net": func() *fs.Inode { return p.newNetDir(ctx, dir.MountSource) },
+ "net": func() *fs.Inode {
+ // If we're using rpcinet we will let it manage /proc/net.
+ if _, ok := p.k.NetworkStack().(*rpcinet.Stack); ok {
+ return newRPCInetProcNet(ctx, dir.MountSource)
+ }
+ return p.newNetDir(ctx, dir.MountSource)
+ },
"self": func() *fs.Inode { return p.newSelf(ctx, dir.MountSource) },
"sys": func() *fs.Inode { return p.newSysDir(ctx, dir.MountSource) },
}