moby
diff --git a/‎cache/contenthash/filehash.go‎
Lines changed: 3 additions & 0 deletions b/‎cache/contenthash/filehash.go‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎client/client_test.go‎
Lines changed: 21 additions & 0 deletions b/‎client/client_test.go‎
Lines changed: 21 additions & 0 deletions
@@ -40,6 +40,9 @@ func NewFileHash(path string, fi os.FileInfo) (hash.Hash, error) {
 }
 
 func NewFromStat(stat *fstypes.Stat) (hash.Hash, error) {
+	// Clear the socket bit since archive/tar.FileInfoHeader does not handle it
+	stat.Mode &^= uint32(os.ModeSocket)
+
 	fi := &statInfo{stat}
 	hdr, err := tar.FileInfoHeader(fi, stat.Linkname)
 	if err != nil {
 
@@ -103,6 +103,7 @@ func TestClientIntegration(t *testing.T) {
 		testCacheMountNoCache,
 		testExporterTargetExists,
 		testTarExporterWithSocket,
+		testTarExporterWithSocketCopy,
 		testMultipleRegistryCacheImportExport,
 	}, mirrors)
 
@@ -1504,6 +1505,26 @@ func testTarExporterWithSocket(t *testing.T, sb integration.Sandbox) {
 	require.NoError(t, err)
 }
 
+func testTarExporterWithSocketCopy(t *testing.T, sb integration.Sandbox) {
+	requiresLinux(t)
+	c, err := New(context.TODO(), sb.Address())
+	require.NoError(t, err)
+	defer c.Close()
+
+	alpine := llb.Image("docker.io/library/alpine:latest")
+	state := alpine.Run(llb.Args([]string{"sh", "-c", "nc -l -s local:/root/socket.sock & usleep 100000; kill %1"})).Root()
+
+	fa := llb.Copy(state, "/root", "/roo2", &llb.CopyInfo{})
+
+	scratchCopy := llb.Scratch().File(fa)
+
+	def, err := scratchCopy.Marshal()
+	require.NoError(t, err)
+
+	_, err = c.Solve(context.TODO(), def, SolveOpt{}, nil)
+	require.NoError(t, err)
+}
+
 func testBuildPushAndValidate(t *testing.T, sb integration.Sandbox) {
 	requiresLinux(t)
 	c, err := New(context.TODO(), sb.Address())
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,9 @@ func NewFileHash(path string, fi os.FileInfo) (hash.Hash, error) {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`func NewFromStat(stat *fstypes.Stat) (hash.Hash, error) {`
	`43`	`+ // Clear the socket bit since archive/tar.FileInfoHeader does not handle it`
	`44`	`+ stat.Mode &^= uint32(os.ModeSocket)`
	`45`	`+`
`43`	`46`	`fi := &statInfo{stat}`
`44`	`47`	`hdr, err := tar.FileInfoHeader(fi, stat.Linkname)`
`45`	`48`	`if err != nil {`