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: Avoid a nil dereference when generating resolv.conf on FreeBSD

Browse Source 
The code which generates resolv.conf dereferenced c.config.Spec.Linux
and this field is not set for FreeBSD containers.

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
This commit is contained in:
Doug Rabson
2022-09-06 11:58:33 +01:00
parent 5abc08df25
commit 369d86040e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libpod/container_internal_common.go
View File

@ -1939,11 +1939,16 @@ func (c *Container) generateResolvConf() error {
destPath := filepath.Join(c.state.RunDir, "resolv.conf") destPath := filepath.Join(c.state.RunDir, "resolv.conf")
var namespaces []spec.LinuxNamespace
if c.config.Spec.Linux != nil {
namespaces = c.config.Spec.Linux.Namespaces
}
if err := resolvconf.New(&resolvconf.Params{ if err := resolvconf.New(&resolvconf.Params{
IPv6Enabled: ipv6, IPv6Enabled: ipv6,
KeepHostServers: keepHostServers, KeepHostServers: keepHostServers,
Nameservers: nameservers, Nameservers: nameservers,
Namespaces: c.config.Spec.Linux.Namespaces, Namespaces: namespaces,
Options: options, Options: options,
Path: destPath, Path: destPath,
Searches: search, Searches: search,