Skip to content

Fix potential panic in createLCOWSpec when no network ns is set #908

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

Merged
katiewasnothere merged 1 commit into from
Dec 10, 2020
Merged

Fix potential panic in createLCOWSpec when no network ns is set #908

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
20 changes: 15 additions & 5 deletions internal/hcsoci/hcsdoc_lcow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func createLCOWSpec(coi *createOptionsInternal) (*specs.Spec, error) {
spec.Windows = nil
if coi.Spec.Windows != nil {
setWindowsNetworkNamespace(coi, spec)
spec.Windows.Devices = coi.Spec.Windows.Devices
setWindowsDevices(coi, spec)
}

// Hooks are not supported (they should be run in the host)
Expand All @@ -52,14 +52,24 @@ func createLCOWSpec(coi *createOptionsInternal) (*specs.Spec, error) {
func setWindowsNetworkNamespace(coi *createOptionsInternal, spec *specs.Spec) {
if coi.Spec.Windows.Network != nil &&
coi.Spec.Windows.Network.NetworkNamespace != "" {
spec.Windows = &specs.Windows{
Network: &specs.WindowsNetwork{
NetworkNamespace: coi.Spec.Windows.Network.NetworkNamespace,
},
if spec.Windows == nil {
spec.Windows = &specs.Windows{}
}
spec.Windows.Network = &specs.WindowsNetwork{
NetworkNamespace: coi.Spec.Windows.Network.NetworkNamespace,
}
}
}

func setWindowsDevices(coi *createOptionsInternal, spec *specs.Spec) {
if coi.Spec.Windows.Devices != nil {
if spec.Windows == nil {
spec.Windows = &specs.Windows{}
}
spec.Windows.Devices = coi.Spec.Windows.Devices
}
}

type linuxHostedSystem struct {
SchemaVersion *hcsschema.Version
OciBundlePath string
Expand Down