Merge pull request moby#4584 from tonistiigi/submount-errors

oci: fix error handling on submount calls
thaJeztah · Jan 25, 2024 · 5092e0f · 5092e0f
2 parents c1a9bdb + 42d866e
commit 5092e0f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/executor/oci/spec.go b/executor/oci/spec.go
@@ -233,12 +233,12 @@ func (s *submounts) subMount(m mount.Mount, subPath string) (mount.Mount, error)
 	}
 	h, err := hashstructure.Hash(m, hashstructure.FormatV2, nil)
 	if err != nil {
-		return mount.Mount{}, nil
+		return mount.Mount{}, err
 	}
 	if mr, ok := s.m[h]; ok {
 		sm, err := sub(mr.mount, subPath)
 		if err != nil {
-			return mount.Mount{}, nil
+			return mount.Mount{}, err
 		}
 		return sm, nil
 	}