summaryrefslogtreecommitdiffhomepage
path: root/runsc/cmd
diff options
context:
space:
mode:
authorKevin Krakauer <krakauer@google.com>2021-07-08 17:53:49 -0700
committergVisor bot <gvisor-bot@google.com>2021-07-08 17:56:11 -0700
commitf8207a823351055a2aaad633b428fe7c1f0585f0 (patch)
tree6db97f66ae0e3c8a42545f9553b8e6c5cfc84fe2 /runsc/cmd
parent052eb90dc15e04dfd8397ca305c507399360dd0e (diff)
clarify safemount behavior
PiperOrigin-RevId: 383750666
Diffstat (limited to 'runsc/cmd')
-rw-r--r--runsc/cmd/chroot.go2
-rw-r--r--runsc/cmd/gofer.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/runsc/cmd/chroot.go b/runsc/cmd/chroot.go
index 791a50135..7b11b3367 100644
--- a/runsc/cmd/chroot.go
+++ b/runsc/cmd/chroot.go
@@ -30,7 +30,7 @@ func mountInChroot(chroot, src, dst, typ string, flags uint32) error {
chrootDst := filepath.Join(chroot, dst)
log.Infof("Mounting %q at %q", src, chrootDst)
- if err := specutils.Mount(src, chrootDst, typ, flags, "/proc"); err != nil {
+ if err := specutils.SafeSetupAndMount(src, chrootDst, typ, flags, "/proc"); err != nil {
return fmt.Errorf("error mounting %q at %q: %v", src, chrootDst, err)
}
return nil
diff --git a/runsc/cmd/gofer.go b/runsc/cmd/gofer.go
index 570df407c..f5eabce74 100644
--- a/runsc/cmd/gofer.go
+++ b/runsc/cmd/gofer.go
@@ -368,7 +368,7 @@ func setupMounts(conf *config.Config, mounts []specs.Mount, root, procPath strin
}
log.Infof("Mounting src: %q, dst: %q, flags: %#x", m.Source, dst, flags)
- if err := specutils.Mount(m.Source, dst, m.Type, flags, procPath); err != nil {
+ if err := specutils.SafeSetupAndMount(m.Source, dst, m.Type, flags, procPath); err != nil {
return fmt.Errorf("mounting %+v: %v", m, err)
}