mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-11 06:03:57 +08:00
libct: always close m.dstFile in mountToRootfs
Signed-off-by: lifubang <lifubang@acmcoder.com>
This commit is contained in:
@@ -589,6 +589,12 @@ func (m *mountEntry) createOpenMountpoint(rootfs string) (Err error) {
|
||||
|
||||
func mountToRootfs(c *mountConfig, m mountEntry) error {
|
||||
rootfs := c.root
|
||||
defer func() {
|
||||
if m.dstFile != nil {
|
||||
_ = m.dstFile.Close()
|
||||
m.dstFile = nil
|
||||
}
|
||||
}()
|
||||
|
||||
// procfs and sysfs are special because we need to ensure they are actually
|
||||
// mounted on a specific path in a container without any funny business.
|
||||
@@ -629,12 +635,6 @@ func mountToRootfs(c *mountConfig, m mountEntry) error {
|
||||
if err := m.createOpenMountpoint(rootfs); err != nil {
|
||||
return fmt.Errorf("create mountpoint for %s mount: %w", m.Destination, err)
|
||||
}
|
||||
defer func() {
|
||||
if m.dstFile != nil {
|
||||
_ = m.dstFile.Close()
|
||||
m.dstFile = nil
|
||||
}
|
||||
}()
|
||||
|
||||
switch m.Device {
|
||||
case "mqueue":
|
||||
|
||||
Reference in New Issue
Block a user