oci: fix error handling on submount calls

tonistiigi · tonistiigi · commit 42d866ef3bcb · 2024-01-24T15:05:14.000-08:00
Signed-off-by: Tonis Tiigi &lt;tonistiigi@gmail.com&gt;
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
 	}

Original file line number	Diff line number	Diff line change
`@@ -233,12 +233,12 @@ func (s *submounts) subMount(m mount.Mount, subPath string) (mount.Mount, error)`
`233`	`233`	`}`
`234`	`234`	`h, err := hashstructure.Hash(m, hashstructure.FormatV2, nil)`
`235`	`235`	`if err != nil {`
`236`		`- return mount.Mount{}, nil`
	`236`	`+ return mount.Mount{}, err`
`237`	`237`	`}`
`238`	`238`	`if mr, ok := s.m[h]; ok {`
`239`	`239`	`sm, err := sub(mr.mount, subPath)`
`240`	`240`	`if err != nil {`
`241`		`- return mount.Mount{}, nil`
	`241`	`+ return mount.Mount{}, err`
`242`	`242`	`}`
`243`	`243`	`return sm, nil`
`244`	`244`	`}`