aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-10-31 14:27:36 +0000
committerUlrich Drepper <drepper@redhat.com>2008-10-31 14:27:36 +0000
commit4bed549a2277f911397ca59189ae71f79750f400 (patch)
tree0aac6faff2726fd62a37eb9c1844b930cc1c43b7
parent3cf449180c18bee7e1c8374a6583cb11d4a39ca7 (diff)
downloadglibc-4bed549a2277f911397ca59189ae71f79750f400.tar
glibc-4bed549a2277f911397ca59189ae71f79750f400.tar.gz
glibc-4bed549a2277f911397ca59189ae71f79750f400.tar.bz2
glibc-4bed549a2277f911397ca59189ae71f79750f400.zip
[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.
-rw-r--r--ChangeLog6
-rw-r--r--debug/getgroups_chk.c8
-rw-r--r--posix/bits/unistd.h4
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b1876983d6..7dac2c5ff5 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 c877ddb9ca..8c3d99da7e 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 efd7f75a50..e29b4cca46 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))