calls to cuserid() can result in buffer overruns and/or overflows

diff --git a/ChangeLog b/ChangeLog
index 7a7e46ca68631af47fcb0d8ba8ffad5d85288703..0e606dd5d5d95e575e1b1e18fd52e5df72311a68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-03-24  Ulrich Drepper  <drepper@redhat.com>
 
+       [BZ #11397]
+       * sysdeps/posix/cuserid.c (cuserid): Make sure the returned string
+       is NUL terminated.
+       Patch by Jonathan Geisler <jgeisler@cse.taylor.edu>.
+
        * sysdeps/unix/sysv/linux/mmap64.c: Allow variable shift values.
 
 2010-03-24  H.J. Lu  <hongjiu.lu@intel.com>

diff --git a/sysdeps/posix/cuserid.c b/sysdeps/posix/cuserid.c
index 11c827a6868743088855f200684965c6d286c85c..f30c20e3f88bd99ececbfd998c0390050ec4358e 100644 (file)
--- a/sysdeps/posix/cuserid.c
+++ b/sysdeps/posix/cuserid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996, 1998, 1999, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1998, 1999, 2001, 2010 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
@@ -44,5 +44,6 @@ cuserid (s)
 
   if (s == NULL)
     s = name;
-  return strncpy (s, pwptr->pw_name, L_cuserid);
+  s[L_userid - 1] = '\0';
+  return strncpy (s, pwptr->pw_name, L_cuserid - 1);
 }