Merge pull request #3947 from lifubang/followup-3939

use the length of UIDMappings/GIDMappings to check whether empty or not
opencontainers · Jul 23, 2023 · a5777e8 · a5777e8
2 parents b4f3891 + c875ea8
commit a5777e8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/libcontainer/configs/config_linux.go b/libcontainer/configs/config_linux.go
@@ -13,7 +13,7 @@ var (
 // different when user namespaces are enabled.
 func (c Config) HostUID(containerId int) (int, error) {
 	if c.Namespaces.Contains(NEWUSER) {
-		if c.UIDMappings == nil {
+		if len(c.UIDMappings) == 0 {
 			return -1, errNoUIDMap
 		}
 		id, found := c.hostIDFromMapping(containerId, c.UIDMappings)
@@ -36,7 +36,7 @@ func (c Config) HostRootUID() (int, error) {
 // different when user namespaces are enabled.
 func (c Config) HostGID(containerId int) (int, error) {
 	if c.Namespaces.Contains(NEWUSER) {
-		if c.GIDMappings == nil {
+		if len(c.GIDMappings) == 0 {
 			return -1, errNoGIDMap
 		}
 		id, found := c.hostIDFromMapping(containerId, c.GIDMappings)