Merge pull request containers#20961 from karuboniru/patch-1

fix checking of relative idmapped mount
edsantiago · Jan 11, 2024 · 83f89db · 83f89db
2 parents 238d08f + 23f6c48
commit 83f89db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/libpod/container_internal_common.go b/libpod/container_internal_common.go
@@ -84,7 +84,7 @@ func parseOptionIDs(ctrMappings []idtools.IDMap, option string) ([]idtools.IDMap
 		if relative {
 			found := false
 			for _, m := range ctrMappings {
-				if v.ContainerID >= m.ContainerID && v.ContainerID < m.ContainerID+m.Size {
+				if v.HostID >= m.ContainerID && v.HostID < m.ContainerID+m.Size {
 					v.HostID += m.HostID - m.ContainerID
 					found = true
 					break

diff --git a/test/system/030-run.bats b/test/system/030-run.bats
@@ -1251,6 +1251,11 @@ EOF
     run_podman run --uidmap=0:1000:10000 --rm --rootfs "$romount:idmap=uids=0-1001-10000;gids=0-1002-10000" stat -c %u:%g /bin
     is "$output" "1:2"
 
+    touch $romount/testfile
+    chown 2000:2000 $romount/testfile
+    run_podman run --uidmap=0:1000:2 --rm --rootfs "$romount:idmap=uids=@2000-1-1;gids=@2000-1-1" stat -c %u:%g /testfile
+    is "$output" "1:1"
+
     rm -rf $romount
 }