archive: store the override xattr with the inode type

Fixes: #2174

Signed-off-by: Giuseppe Scrivano <[email protected]>

pkg/archive/archive.go

@@ -660,7 +660,17 @@ func createTarFile(path, extractDir string, hdr *tar.Header, reader io.Reader, L
 		mask = *forceMask
 	}
 
-	switch hdr.Typeflag {
+	typeFlag := hdr.Typeflag
+
+	if forceMask != nil {
+		// If we have a forceMask, force the real type to either be a directory,
+		// or a regular file.
+		if typeFlag != tar.TypeDir {
+			typeFlag = tar.TypeReg
+		}
+	}
+
+	switch typeFlag {
 	case tar.TypeDir:
 		// Create directory unless it exists as a directory already.
 		// In that case we just want to merge the two
@@ -730,8 +740,10 @@ func createTarFile(path, extractDir string, hdr *tar.Header, reader io.Reader, L
 
 	if forceMask != nil && (hdr.Typeflag != tar.TypeSymlink || runtime.GOOS == "darwin") {
 		value := idtools.Stat{
-			IDs:  idtools.IDPair{UID: hdr.Uid, GID: hdr.Gid},
-			Mode: hdrInfo.Mode() & 0o7777,
+			IDs:   idtools.IDPair{UID: hdr.Uid, GID: hdr.Gid},
+			Mode:  hdrInfo.Mode(),
+			Major: int(hdr.Devmajor),
+			Minor: int(hdr.Devminor),
 		}
 		if err := idtools.SetContainersOverrideXattr(path, value); err != nil {
 			return err
@@ -1149,11 +1161,11 @@ loop:
 	}
 
 	if options.ForceMask != nil {
-		value := idtools.Stat{Mode: 0o755}
+		value := idtools.Stat{Mode: os.ModeDir | os.FileMode(0o755)}
 		if rootHdr != nil {
 			value.IDs.UID = rootHdr.Uid
 			value.IDs.GID = rootHdr.Gid
-			value.Mode = os.FileMode(rootHdr.Mode)
+			value.Mode = os.ModeDir | os.FileMode(rootHdr.Mode)
 		}
 		if err := idtools.SetContainersOverrideXattr(dest, value); err != nil {
 			return err