opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 00:56:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24594 from openshift-cherrypick-robot/cherry-pick-24578-to-v5.3

Browse Source 
[v5.3] libpod: addHosts() prevent nil deref
This commit is contained in:
openshift-merge-bot[bot]
2024-11-18 13:43:05 +00:00
committed by GitHub
parent d3e7d4e217 a39a749ce3
commit 878f3ae687
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/container_internal_common.go
View File

@ -2323,7 +2323,7 @@ func (c *Container) addHosts() error {
// not be routed to the host. // not be routed to the host.
// https://github.com/containers/podman/issues/22653 // https://github.com/containers/podman/issues/22653
info, err := c.runtime.network.RootlessNetnsInfo() info, err := c.runtime.network.RootlessNetnsInfo()
if err == nil { if err == nil && info != nil {
exclude = info.IPAddresses exclude = info.IPAddresses
if len(info.MapGuestIps) > 0 { if len(info.MapGuestIps) > 0 {
// we used --map-guest-addr to setup pasta so prefer this address // we used --map-guest-addr to setup pasta so prefer this address

2
libpod/container_internal_linux.go
View File

@ -624,7 +624,7 @@ func (c *Container) addSpecialDNS(nameservers []string) []string {
switch { switch {
case c.config.NetMode.IsBridge(): case c.config.NetMode.IsBridge():
info, err := c.runtime.network.RootlessNetnsInfo() info, err := c.runtime.network.RootlessNetnsInfo()
if err == nil { if err == nil && info != nil {
nameservers = append(nameservers, info.DnsForwardIps...) nameservers = append(nameservers, info.DnsForwardIps...)
} }
case c.pastaResult != nil: case c.pastaResult != nil: