Fix handling of CheckRootlessUIDRange

If I have multiple ranges of UIDs specified in the /etc/subuid, this check blows up and incorrectly blocks the use of --user flag. Signed-off-by: Daniel J Walsh <[email protected]>
containers · Oct 5, 2020 · 30bd8ed · 30bd8ed
1 parent caace52
commit 30bd8ed
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/pkg/util/utils_linux.go b/pkg/util/utils_linux.go
@@ -60,11 +60,12 @@ func CheckRootlessUIDRange(uid int) error {
 	if err != nil {
 		return err
 	}
+	total := 0
 	for _, u := range uids {
-		// add 1 since we also map in the user's own UID
-		if uid > u.Size+1 {
-			return errors.Errorf("requested user's UID %d is too large for the rootless user namespace", uid)
-		}
+		total += u.Size
+	}
+	if uid > total {
+		return errors.Errorf("requested user's UID %d is too large for the rootless user namespace", uid)
 	}
 	return nil
 }