From: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>
Date: Tue, 2 Dec 2025 05:50:28 +0000 (-0500)
Subject: unshare: use MAX_OF_UINT_TYPE instead of (type)-1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8a75b667520c72c45b032bf42b8905cb276ee3c;p=thirdparty%2Futil-linux.git

unshare: use MAX_OF_UINT_TYPE instead of (type)-1

Signed-off-by: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>
---

diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c
index 0671ed3e1..3cec3be82 100644
--- a/sys-utils/unshare.c
+++ b/sys-utils/unshare.c
@@ -1190,14 +1190,14 @@ int main(int argc, char *argv[])
 #endif
 	}
 
-        if (mapuser != (uid_t) -1 && !usermap)
+        if (mapuser != MAX_OF_UINT_TYPE(uid_t) && !usermap)
 		map_id(_PATH_PROC_UIDMAP, mapuser, real_euid);
 
         /* Since Linux 3.19 unprivileged writing of /proc/self/gid_map
          * has been disabled unless /proc/self/setgroups is written
          * first to permanently disable the ability to call setgroups
          * in that user namespace. */
-	if (mapgroup != (gid_t) -1 && !groupmap) {
+	if (mapgroup != MAX_OF_UINT_TYPE(gid_t) && !groupmap) {
 		if (setgrpcmd == SETGROUPS_ALLOW)
 			errx(EXIT_FAILURE, _("options --setgroups=allow and "
 					"--map-group are mutually exclusive"));