Merge pull request #24578 from Luap99/addHosts-nil-deref

openshift-merge-bot[bot] · web-flow · commit e1951772c5f0 · 2024-11-18T12:59:03.000Z
libpod: addHosts() prevent nil deref
diff --git a/libpod/container_internal_common.go b/libpod/container_internal_common.go
@@ -2322,7 +2322,7 @@ func (c *Container) addHosts() error {
 		// not be routed to the host.
 		// https://github.com/containers/podman/issues/22653
 		info, err := c.runtime.network.RootlessNetnsInfo()
-		if err == nil {
+		if err == nil && info != nil {
 			exclude = info.IPAddresses
 			if len(info.MapGuestIps) > 0 {
 				// we used --map-guest-addr to setup pasta so prefer this address
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
@@ -624,7 +624,7 @@ func (c *Container) addSpecialDNS(nameservers []string) []string {
 	switch {
 	case c.config.NetMode.IsBridge():
 		info, err := c.runtime.network.RootlessNetnsInfo()
-		if err == nil {
+		if err == nil && info != nil {
 			nameservers = append(nameservers, info.DnsForwardIps...)
 		}
 	case c.pastaResult != nil:

Original file line number	Diff line number	Diff line change
`@@ -624,7 +624,7 @@ func (c *Container) addSpecialDNS(nameservers []string) []string {`
`624`	`624`	`switch {`
`625`	`625`	`case c.config.NetMode.IsBridge():`
`626`	`626`	`info, err := c.runtime.network.RootlessNetnsInfo()`
`627`		`- if err == nil {`
	`627`	`+ if err == nil && info != nil {`
`628`	`628`	`nameservers = append(nameservers, info.DnsForwardIps...)`
`629`	`629`	`}`
`630`	`630`	`case c.pastaResult != nil:`