diff options
| author | Jonathan Geisler <jgeisler@cse.taylor.edu> | 2010-03-24 16:02:15 -0700 |
|---|---|---|
| committer | Petr Baudis <pasky@ucw.cz> | 2010-05-12 02:21:02 +0200 |
| commit | f273badc6b317d8d0ba9ba52e873c98a7e72a4e7 (patch) | |
| tree | c809bd88df017dcb39d8d3832acbc291ee930ec3 | |
| parent | 877103176f621c64bdd847e2db49205de7e32e61 (diff) | |
calls to cuserid() can result in buffer overruns and/or overflows
(cherry picked from commit fd8ccb0427569ffdfbb70c8828029122f3459160)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/posix/cuserid.c | 5 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +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>. + 2010-03-02 Richard Guenther <rguenther@suse.de> * sysdeps/x86_64/dl-machine.h (elf_machine_rela): R_X86_64_PC32 diff --git a/sysdeps/posix/cuserid.c b/sysdeps/posix/cuserid.c index 11c827a686..f30c20e3f8 100644 --- 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); } |