pathrs: rename MkdirAllInRootOpen -> MkdirAllInRoot

Now that MkdirAllInRoot has been removed, we can make MkdirAllInRootOpen
less wordy by renaming it to MkdirAllInRoot. This is a non-functional
change.

Signed-off-by: Aleksa Sarai <[email protected]>

Author: cyphar

internal/pathrs/mkdirall_pathrslite.go

@@ -28,7 +28,7 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-// MkdirAllInRootOpen attempts to make
+// MkdirAllInRoot attempts to make
 //
 //	path, _ := securejoin.SecureJoin(root, unsafePath)
 //	os.MkdirAll(path, mode)
@@ -49,10 +49,10 @@ import (
 // handling if unsafePath has already been scoped within the rootfs (this is
 // needed for a lot of runc callers and fixing this would require reworking a
 // lot of path logic).
-func MkdirAllInRootOpen(root, unsafePath string, mode os.FileMode) (*os.File, error) {
+func MkdirAllInRoot(root, unsafePath string, mode os.FileMode) (*os.File, error) {
 	// If the path is already "within" the root, get the path relative to the
 	// root and use that as the unsafe path. This is necessary because a lot of
-	// MkdirAllInRootOpen callers have already done SecureJoin, and refactoring
+	// MkdirAllInRoot callers have already done SecureJoin, and refactoring
 	// all of them to stop using these SecureJoin'd paths would require a fair
 	// amount of work.
 	// TODO(cyphar): Do the refactor to libpathrs once it's ready.

internal/pathrs/root_pathrslite.go

@@ -55,7 +55,7 @@ func CreateInRoot(root, subpath string, flags int, fileMode uint32) (*os.File, e
 		return nil, fmt.Errorf("create in root subpath %q has bad trailing component %q", subpath, filename)
 	}
 
-	dirFd, err := MkdirAllInRootOpen(root, dir, 0o755)
+	dirFd, err := MkdirAllInRoot(root, dir, 0o755)
 	if err != nil {
 		return nil, err
 	}

libcontainer/rootfs_linux.go

@@ -332,7 +332,7 @@ func mountCgroupV1(m mountEntry, c *mountConfig) error {
 			// TODO: Why not just use b.Destination (c.root is the root here)?
 			subsystemPath := filepath.Join(c.root, b.Destination)
 			subsystemName := filepath.Base(b.Destination)
-			subsystemDir, err := pathrs.MkdirAllInRootOpen(c.root, subsystemPath, 0o755)
+			subsystemDir, err := pathrs.MkdirAllInRoot(c.root, subsystemPath, 0o755)
 			if err != nil {
 				return err
 			}
@@ -561,7 +561,7 @@ func (m *mountEntry) createOpenMountpoint(rootfs string) (Err error) {
 		if dstIsFile {
 			dstFile, err = pathrs.CreateInRoot(rootfs, unsafePath, unix.O_CREAT|unix.O_EXCL|unix.O_NOFOLLOW, 0o644)
 		} else {
-			dstFile, err = pathrs.MkdirAllInRootOpen(rootfs, unsafePath, 0o755)
+			dstFile, err = pathrs.MkdirAllInRoot(rootfs, unsafePath, 0o755)
 		}
 		if err != nil {
 			return fmt.Errorf("make mountpoint %q: %w", m.Destination, err)
@@ -617,7 +617,7 @@ func mountToRootfs(c *mountConfig, m mountEntry) error {
 		} else if !fi.IsDir() {
 			return fmt.Errorf("filesystem %q must be mounted on ordinary directory", m.Device)
 		}
-		dstFile, err := pathrs.MkdirAllInRootOpen(rootfs, dest, 0o755)
+		dstFile, err := pathrs.MkdirAllInRoot(rootfs, dest, 0o755)
 		if err != nil {
 			return err
 		}
@@ -994,7 +994,7 @@ func createDeviceNode(rootfs string, node *devices.Device, bind bool) error {
 		return fmt.Errorf("%w: mknod over rootfs", errRootfsToFile)
 	}
 	destDirPath, destName := filepath.Split(destPath)
-	destDir, err := pathrs.MkdirAllInRootOpen(rootfs, destDirPath, 0o755)
+	destDir, err := pathrs.MkdirAllInRoot(rootfs, destDirPath, 0o755)
 	if err != nil {
 		return fmt.Errorf("mkdir parent of device inode %q: %w", node.Path, err)
 	}