Remove option to panic gofer

Gofer panics are suppressed by p9 server and an error
is returned to the caller, making it effectively the
same as returning EROFS.

PiperOrigin-RevId: 332282959
This commit is contained in:
Fabricio Voznika
2020-09-17 12:01:45 -07:00
committed by gVisor bot
parent f0b1bd434e
commit da07e38f7c
4 changed files with 6 additions and 38 deletions
+6 -9
View File
@@ -62,9 +62,8 @@ type Gofer struct {
applyCaps bool
setUpRoot bool
panicOnWrite bool
specFD int
mountsFD int
specFD int
mountsFD int
}
// Name implements subcommands.Command.
@@ -87,7 +86,6 @@ func (g *Gofer) SetFlags(f *flag.FlagSet) {
f.StringVar(&g.bundleDir, "bundle", "", "path to the root of the bundle directory, defaults to the current directory")
f.Var(&g.ioFDs, "io-fds", "list of FDs to connect 9P servers. They must follow this order: root first, then mounts as defined in the spec")
f.BoolVar(&g.applyCaps, "apply-caps", true, "if true, apply capabilities to restrict what the Gofer process can do")
f.BoolVar(&g.panicOnWrite, "panic-on-write", false, "if true, panics on attempts to write to RO mounts. RW mounts are unnaffected")
f.BoolVar(&g.setUpRoot, "setup-root", true, "if true, set up an empty root for the process")
f.IntVar(&g.specFD, "spec-fd", -1, "required fd with the container spec")
f.IntVar(&g.mountsFD, "mounts-fd", -1, "mountsFD is the file descriptor to write list of mounts after they have been resolved (direct paths, no symlinks).")
@@ -168,8 +166,7 @@ func (g *Gofer) Execute(_ context.Context, f *flag.FlagSet, args ...interface{})
// Start with root mount, then add any other additional mount as needed.
ats := make([]p9.Attacher, 0, len(spec.Mounts)+1)
ap, err := fsgofer.NewAttachPoint("/", fsgofer.Config{
ROMount: spec.Root.Readonly || conf.Overlay,
PanicOnWrite: g.panicOnWrite,
ROMount: spec.Root.Readonly || conf.Overlay,
})
if err != nil {
Fatalf("creating attach point: %v", err)
@@ -181,9 +178,8 @@ func (g *Gofer) Execute(_ context.Context, f *flag.FlagSet, args ...interface{})
for _, m := range spec.Mounts {
if specutils.Is9PMount(m) {
cfg := fsgofer.Config{
ROMount: isReadonlyMount(m.Options) || conf.Overlay,
PanicOnWrite: g.panicOnWrite,
HostUDS: conf.FSGoferHostUDS,
ROMount: isReadonlyMount(m.Options) || conf.Overlay,
HostUDS: conf.FSGoferHostUDS,
}
ap, err := fsgofer.NewAttachPoint(m.Destination, cfg)
if err != nil {
@@ -316,6 +312,7 @@ func setupRootFS(spec *specs.Spec, conf *config.Config) error {
if err != nil {
return fmt.Errorf("resolving symlinks to %q: %v", spec.Process.Cwd, err)
}
log.Infof("Create working directory %q if needed", spec.Process.Cwd)
if err := os.MkdirAll(dst, 0755); err != nil {
return fmt.Errorf("creating working directory %q: %v", spec.Process.Cwd, err)
}
-3
View File
@@ -902,9 +902,6 @@ func (c *Container) createGoferProcess(spec *specs.Spec, conf *config.Config, bu
}
args = append(args, "gofer", "--bundle", bundleDir)
if conf.Overlay {
args = append(args, "--panic-on-write=true")
}
// Open the spec file to donate to the sandbox.
specFile, err := specutils.OpenSpec(bundleDir)
-3
View File
@@ -1181,9 +1181,6 @@ func extractErrno(err error) unix.Errno {
func (l *localFile) checkROMount() error {
if conf := l.attachPoint.conf; conf.ROMount {
if conf.PanicOnWrite {
panic("attempt to write to RO mount")
}
return unix.EROFS
}
return nil
-23
View File
@@ -553,29 +553,6 @@ func TestROMountChecks(t *testing.T) {
})
}
func TestROMountPanics(t *testing.T) {
conf := Config{ROMount: true, PanicOnWrite: true}
uid := p9.UID(os.Getuid())
gid := p9.GID(os.Getgid())
runCustom(t, allTypes, []Config{conf}, func(t *testing.T, s state) {
if s.fileType != unix.S_IFLNK {
assertPanic(t, func() { s.file.Open(p9.WriteOnly) })
}
assertPanic(t, func() { s.file.Create("some_file", p9.ReadWrite, 0777, uid, gid) })
assertPanic(t, func() { s.file.Mkdir("some_dir", 0777, uid, gid) })
assertPanic(t, func() { s.file.RenameAt("some_file", s.file, "other_file") })
assertPanic(t, func() { s.file.Symlink("some_place", "some_symlink", uid, gid) })
assertPanic(t, func() { s.file.UnlinkAt("some_file", 0) })
assertPanic(t, func() { s.file.Link(s.file, "some_link") })
assertPanic(t, func() { s.file.Mknod("some-nod", 0777, 1, 2, uid, gid) })
valid := p9.SetAttrMask{Size: true}
attr := p9.SetAttr{Size: 0}
assertPanic(t, func() { s.file.SetAttr(valid, attr) })
})
}
func TestWalkNotFound(t *testing.T) {
runCustom(t, []uint32{unix.S_IFDIR}, allConfs, func(t *testing.T, s state) {
if _, _, err := s.file.Walk([]string{"nobody-here"}); err != unix.ENOENT {