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

libpod: Add checks to avoid nil pointer dereference if network setup fails

Browse Source 
This addresses #16333 although that issue was also avoided by changes in
PR #16554.

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
This commit is contained in:
Doug Rabson
2022-11-28 11:40:34 +00:00
parent ab7f6095a1
commit 07940764c1
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libpod/container_internal_freebsd.go
View File

@ -164,11 +164,13 @@ func (c *Container) reloadNetwork() error {
// Add an existing container's network jail // Add an existing container's network jail
func (c *Container) addNetworkContainer(g *generate.Generator, ctr string) error { func (c *Container) addNetworkContainer(g *generate.Generator, ctr string) error {
nsCtr, err := c.runtime.state.Container(ctr) nsCtr, err := c.runtime.state.Container(ctr)
c.runtime.state.UpdateContainer(nsCtr)
if err != nil { if err != nil {
return fmt.Errorf("retrieving dependency %s of container %s from state: %w", ctr, c.ID(), err) return fmt.Errorf("retrieving dependency %s of container %s from state: %w", ctr, c.ID(), err)
} }
g.AddAnnotation("org.freebsd.parentJail", nsCtr.state.NetNS.Name) c.runtime.state.UpdateContainer(nsCtr)
if nsCtr.state.NetNS != nil {
g.AddAnnotation("org.freebsd.parentJail", nsCtr.state.NetNS.Name)
}
return nil return nil
} }
@ -191,6 +193,14 @@ func openDirectory(path string) (fd int, err error) {
func (c *Container) addNetworkNamespace(g *generate.Generator) error { func (c *Container) addNetworkNamespace(g *generate.Generator) error {
if c.config.CreateNetNS { if c.config.CreateNetNS {
if c.state.NetNS == nil {
// This should not happen since network setup
// errors should be propagated correctly from
// (*Runtime).createNetNS. Check for it anyway
// since it caused nil pointer dereferences in
// the past (see #16333).
return fmt.Errorf("Inconsistent state: c.config.CreateNetNS is set but c.state.NetNS is nil")
}
g.AddAnnotation("org.freebsd.parentJail", c.state.NetNS.Name) g.AddAnnotation("org.freebsd.parentJail", c.state.NetNS.Name)
} }
return nil return nil