From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 31 Oct 2008 14:27:36 +0000 (+0000)
Subject: [BZ #6980]
X-Git-Tag: cvs/fedora-glibc-20081031T2102~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bed549a2277f911397ca59189ae71f79750f400;p=thirdparty%2Fglibc.git

[BZ #6980]

	* debug/getgroups_chk.c (__getgroups_chk): Return EINVAL error for
	negative sizees.
	* posix/bits/unistd.h (getgroups): Call __getgroups_chk for
	negative __size.
---

diff --git a/ChangeLog b/ChangeLog
index b1876983d6f..7dac2c5ff55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-10-31  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #6980]
+	* debug/getgroups_chk.c (__getgroups_chk): Return EINVAL error for
+	negative sizees.
+	* posix/bits/unistd.h (getgroups): Call __getgroups_chk for
+	negative __size.
+
 	[BZ #6995]
 	* sysdeps/powerpc/powerpc32/dl-machine.c: Fix typo in message.
 
diff --git a/debug/getgroups_chk.c b/debug/getgroups_chk.c
index c877ddb9cae..8c3d99da7e7 100644
--- a/debug/getgroups_chk.c
+++ b/debug/getgroups_chk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,6 +23,12 @@
 int
 __getgroups_chk (int size, __gid_t list[], size_t listlen)
 {
+  if (__builtin_expect (size < 0, 0))
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
   if (__builtin_expect (size * sizeof (__gid_t) > listlen, 0))
     __chk_fail ();
 
diff --git a/posix/bits/unistd.h b/posix/bits/unistd.h
index efd7f75a507..e29b4cca467 100644
--- a/posix/bits/unistd.h
+++ b/posix/bits/unistd.h
@@ -1,5 +1,5 @@
 /* Checking macros for unistd functions.
-   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -267,7 +267,7 @@ __NTH (getgroups (int __size, __gid_t __list[]))
 {
   if (__bos (__list) != (size_t) -1)
     {
-      if (!__builtin_constant_p (__size))
+      if (!__builtin_constant_p (__size) || __size < 0)
 	return __getgroups_chk (__size, __list, __bos (__list));
 
       if (__size * sizeof (__gid_t) > __bos (__list))