rootless cni: resolve absolute symlinks correctly

When /etc/resolv.conf is a symlink to an absolute path use it and not join it the the previous path. [NO TESTS NEEDED] This depends on the host layout. Fixes containers#11358 Signed-off-by: Paul Holzinger <[email protected]>
mheon · Aug 30, 2021 · 0103a04 · 0103a04
1 parent 77948c8
commit 0103a04
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go
@@ -185,7 +185,13 @@ func (r *RootlessCNI) Do(toRun func() error) error {
 				// if there is no symlink exit
 				break
 			}
-			resolvePath = filepath.Join(filepath.Dir(resolvePath), link)
+			if filepath.IsAbs(link) {
+				// link is as an absolute path
+				resolvePath = link
+			} else {
+				// link is as a relative, join it with the previous path
+				resolvePath = filepath.Join(filepath.Dir(resolvePath), link)
+			}
 			if strings.HasPrefix(resolvePath, "/run/") {
 				break
 			}