fix: bug potentially not removing RW device.

Signed-off-by: Maksim An <maksiman@microsoft.com>
microsoft · Apr 18, 2023 · 1cf3d81 · 1cf3d81
1 parent 792a588
commit 1cf3d81
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/internal/guest/runtime/hcsv2/uvm.go b/internal/guest/runtime/hcsv2/uvm.go
@@ -538,7 +538,7 @@ func (h *Host) CreateContainer(ctx context.Context, id string, settings *prot.VM
 	return c, nil
 }
 
-func (h *Host) modifyHostSettings(ctx context.Context, containerID string, req *guestrequest.ModificationRequest) (err error) {
+func (h *Host) modifyHostSettings(ctx context.Context, containerID string, req *guestrequest.ModificationRequest) (retErr error) {
 	switch req.ResourceType {
 	case guestresource.ResourceTypeMappedVirtualDisk:
 		mvd := req.Settings.(*guestresource.LCOWMappedVirtualDisk)
@@ -561,7 +561,7 @@ func (h *Host) modifyHostSettings(ctx context.Context, containerID string, req *
 					return err
 				}
 				defer func() {
-					if err != nil {
+					if retErr != nil {
 						_ = h.hostMounts.RemoveRWDevice(mvd.MountPath, source)
 					}
 				}()
@@ -570,7 +570,7 @@ func (h *Host) modifyHostSettings(ctx context.Context, containerID string, req *
 					return err
 				}
 				defer func() {
-					if err != nil {
+					if retErr != nil {
 						_ = h.hostMounts.AddRWDevice(mvd.MountPath, source, mvd.Encrypted)
 					}
 				}()