Skip to content

Commit

Permalink
Update copy.DirCopy to not unlink sockets
Browse files Browse the repository at this point in the history
- Closes containers#2113

`copy.DirCopy` contains code to create named sockets matching those on
the source; however, this operation closes the socket, removing it
implicitly from the destination and causing later chown and chmod
operations to fail.

This commit creates matching file system nodes directly without opening
a socket or invoking the auto-removal semantics of a listener.

Signed-off-by: Jonathon Anderson <[email protected]>
  • Loading branch information
anderbubble committed Oct 30, 2024
1 parent d7f8028 commit fbf5ab0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/copy/copy_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"errors"
"fmt"
"io"
"net"
"os"
"path/filepath"
"strings"
Expand Down Expand Up @@ -199,11 +198,9 @@ func DirCopy(srcDir, dstDir string, copyMode Mode, copyXattrs bool) error {
}

case mode&os.ModeSocket != 0:
s, err := net.Listen("unix", dstPath)
if err != nil {
if err := unix.Mknod(dstPath, stat.Mode, int(stat.Rdev)); err != nil {
return err
}
s.Close()

case mode&os.ModeDevice != 0:
if unshare.IsRootless() {
Expand Down
6 changes: 6 additions & 0 deletions drivers/copy/copy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package copy
import (
"fmt"
"math/rand"
"net"
"os"
"path/filepath"
"syscall"
Expand Down Expand Up @@ -83,6 +84,11 @@ func randomMode(baseMode int) os.FileMode {

func populateSrcDir(t *testing.T, srcDir string, remainingDepth int) {
if remainingDepth == 0 {
socketPath := filepath.Join(srcDir, "srcsocket")
s, err := net.ListenUnix("unix", &net.UnixAddr{Name: socketPath, Net: "unix"})
assert.NilError(t, err)
unixListener.SetUnlinkOnClose(false)
s.Close()
return
}
aTime := time.Unix(rand.Int63(), 0)
Expand Down

0 comments on commit fbf5ab0

Please sign in to comment.