7 files changed, 30 insertions, 17 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/chown.c b/sysdeps/unix/sysv/linux/i386/chown.c
index 9addfd0598..8652d0f097 100644
--- a/sysdeps/unix/sysv/linux/i386/chown.c
+++ b/sysdeps/unix/sysv/linux/i386/chown.c
@@ -38,7 +38,7 @@
 */
 
 extern int __syscall_chown (const char *__file,
-			    uid_t __owner, gid_t __group);
+			    __kernel_uid_t __owner, __kernel_gid_t __group);
 #if defined __NR_lchown || __ASSUME_LCHOWN_SYSCALL > 0
 /* Running under Linux > 2.1.80.  */
 
@@ -76,6 +76,13 @@ __real_chown (const char *file, uid_t owner, gid_t group)
 	  __libc_missing_32bit_uids = 1;
 	}
 #  endif /* __NR_chown32 */
+      if (((owner + 1) > (uid_t) ((__kernel_uid_t) -1U))
+	  || ((group + 1) > (gid_t) ((__kernel_gid_t) -1U)))
+	{
+	  __set_errno (EINVAL);
+	  return -1;
+	}
+
       result = INLINE_SYSCALL (chown, 3, file, owner, group);
 
       if (result >= 0 || errno != ENOSYS)
@@ -105,6 +112,13 @@ __real_chown (const char *file, uid_t owner, gid_t group)
       __libc_missing_32bit_uids = 1;
     }
 #  endif /* __NR_chown32 */
+  if (((owner + 1) > (uid_t) ((__kernel_uid_t) -1U))
+      || ((group + 1) > (gid_t) ((__kernel_gid_t) -1U)))
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
   return INLINE_SYSCALL (chown, 3, file, owner, group);
 # endif
 }
diff --git a/sysdeps/unix/sysv/linux/i386/fchown.c b/sysdeps/unix/sysv/linux/i386/fchown.c
index 7d4c360dbd..5a84d4170e 100644
--- a/sysdeps/unix/sysv/linux/i386/fchown.c
+++ b/sysdeps/unix/sysv/linux/i386/fchown.c
@@ -59,8 +59,8 @@ __fchown (int fd, uid_t owner, gid_t group)
     }
 # endif /* __NR_fchown32 */
 
-  if ( (owner != (uid_t) ((__kernel_uid_t) owner)) ||
-       (group != (gid_t) ((__kernel_gid_t) group)) )
+  if (((owner + 1) > (uid_t) ((__kernel_uid_t) -1U))
+      || ((group + 1) > (gid_t) ((__kernel_gid_t) -1U)))
     {
       __set_errno (EINVAL);
       return -1;
diff --git a/sysdeps/unix/sysv/linux/i386/lchown.c b/sysdeps/unix/sysv/linux/i386/lchown.c
index 86ff7d518d..2d8e8fb998 100644
--- a/sysdeps/unix/sysv/linux/i386/lchown.c
+++ b/sysdeps/unix/sysv/linux/i386/lchown.c
@@ -60,8 +60,8 @@ __lchown (const char *file, uid_t owner, gid_t group)
     }
 #  endif /* __NR_lchown32 */
 
-  if ( (owner != (uid_t) ((__kernel_uid_t) owner)) ||
-       (group != (gid_t) ((__kernel_gid_t) group)) )
+  if (((owner + 1) > (uid_t) ((__kernel_uid_t) -1U))
+      || ((group + 1) > (gid_t) ((__kernel_gid_t) -1U)))
     {
       __set_errno (EINVAL);
       return -1;
@@ -76,4 +76,3 @@ weak_alias (__lchown, lchown)
 #else
 # include <sysdeps/generic/lchown.c>
 #endif
-
diff --git a/sysdeps/unix/sysv/linux/i386/setregid.c b/sysdeps/unix/sysv/linux/i386/setregid.c
index 4f00d30bc6..b4d0a2a116 100644
--- a/sysdeps/unix/sysv/linux/i386/setregid.c
+++ b/sysdeps/unix/sysv/linux/i386/setregid.c
@@ -59,8 +59,8 @@ __setregid (gid_t rgid, gid_t egid)
       __libc_missing_32bit_uids = 1;
     }
 # endif /* __NR_setregid32 */
-  if ((rgid != (gid_t) -1 && rgid != (gid_t) (__kernel_gid_t) rgid)
-      || (egid != (gid_t) -1 && egid != (gid_t) (__kernel_gid_t) egid))
+  if (((rgid + 1) > (gid_t) ((__kernel_gid_t) -1U))
+      || ((egid + 1) > (gid_t) ((__kernel_gid_t) -1U)))
     {
       __set_errno (EINVAL);
       return -1;
diff --git a/sysdeps/unix/sysv/linux/i386/setresgid.c b/sysdeps/unix/sysv/linux/i386/setresgid.c
index 45dbcc8485..97bb97469c 100644
--- a/sysdeps/unix/sysv/linux/i386/setresgid.c
+++ b/sysdeps/unix/sysv/linux/i386/setresgid.c
@@ -62,9 +62,9 @@ setresgid (gid_t rgid, gid_t egid, gid_t sgid)
     }
 #  endif /* __NR_setresgid32 */
 
-  if ((rgid != (gid_t) -1 && rgid != (gid_t) (__kernel_gid_t) rgid)
-      || (egid != (gid_t) -1 && egid != (gid_t) (__kernel_gid_t) egid)
-      || (sgid != (gid_t) -1 && sgid != (gid_t) (__kernel_gid_t) sgid))
+  if (((rgid + 1) > (gid_t) ((__kernel_gid_t) -1U))
+      || ((egid + 1) > (gid_t) ((__kernel_gid_t) -1U))
+      || ((sgid + 1) > (gid_t) ((__kernel_gid_t) -1U)))
     {
       __set_errno (EINVAL);
       return -1;
diff --git a/sysdeps/unix/sysv/linux/i386/setresuid.c b/sysdeps/unix/sysv/linux/i386/setresuid.c
index 90214526ab..94fc79ba5c 100644
--- a/sysdeps/unix/sysv/linux/i386/setresuid.c
+++ b/sysdeps/unix/sysv/linux/i386/setresuid.c
@@ -44,7 +44,7 @@ extern int __libc_missing_32bit_uids;
 int
 __setresuid (uid_t ruid, uid_t euid, uid_t suid)
 {
-# if __ASSUME_32BITUIDS > 0  
+# if __ASSUME_32BITUIDS > 0
   return INLINE_SYSCALL (setresuid32, 3, ruid, euid, suid);
 # else
 #  ifdef __NR_setresuid32
@@ -62,9 +62,9 @@ __setresuid (uid_t ruid, uid_t euid, uid_t suid)
     }
 #  endif /* __NR_setresuid32 */
 
-  if ((ruid != (uid_t) -1 && ruid != (uid_t) (__kernel_uid_t) ruid)
-      || (euid != (uid_t) -1 && euid != (uid_t) (__kernel_uid_t) euid)
-      || (suid != (uid_t) -1 && suid != (uid_t) (__kernel_uid_t) suid))
+  if (((ruid + 1) > (uid_t) ((__kernel_uid_t) -1U))
+      || ((euid + 1) > (uid_t) ((__kernel_uid_t) -1U))
+      || ((suid + 1) > (uid_t) ((__kernel_uid_t) -1U)))
     {
       __set_errno (EINVAL);
       return -1;
diff --git a/sysdeps/unix/sysv/linux/i386/setreuid.c b/sysdeps/unix/sysv/linux/i386/setreuid.c
index 58ddff2b00..b660604152 100644
--- a/sysdeps/unix/sysv/linux/i386/setreuid.c
+++ b/sysdeps/unix/sysv/linux/i386/setreuid.c
@@ -59,8 +59,8 @@ __setreuid (uid_t ruid, uid_t euid)
       __libc_missing_32bit_uids = 1;
     }
 # endif /* __NR_setreuid32 */
-  if ((ruid != (uid_t) -1 && ruid != (uid_t) (__kernel_uid_t) ruid)
-      || (euid != (uid_t) -1 && euid != (uid_t) (__kernel_uid_t) euid))
+  if (((ruid + 1) > (uid_t) ((__kernel_uid_t) -1U))
+      || ((euid + 1) > (uid_t) ((__kernel_uid_t) -1U)))
     {
       __set_errno (EINVAL);
       return -1;