Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: nil pointer deref when calling vm.OS() #1753

Closed
wants to merge 1 commit into from
Closed

fix: nil pointer deref when calling vm.OS() #1753

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions internal/layers/layers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,14 @@ func MountLCOWLayers(ctx context.Context, containerID string, layerFolders []str
// Job container: Returns the mount path on the host as a volume guid, with the volume mounted on
// the host at `volumeMountPath`.
func MountWCOWLayers(ctx context.Context, containerID string, layerFolders []string, guestRoot, volumeMountPath string, vm *uvm.UtilityVM) (_ string, _ resources.ResourceCloser, err error) {
if vm == nil {
return mountWCOWHostLayers(ctx, layerFolders, volumeMountPath)
}

if vm.OS() != "windows" {
return "", nil, errors.New("MountWCOWLayers should only be called for WCOW")
}

if vm == nil {
return mountWCOWHostLayers(ctx, layerFolders, volumeMountPath)
}
return mountWCOWIsolatedLayers(ctx, containerID, layerFolders, guestRoot, volumeMountPath, vm)
}

Expand Down