about summary refs log tree commit diff
path: root/elf/dl-sysdep.c
diff options
context:
space:
mode:
authorPaul Pluzhnikov <ppluzhnikov@google.com>2012-05-02 14:35:30 -0700
committerPaul Pluzhnikov <ppluzhnikov@google.com>2012-05-02 14:35:30 -0700
commit171a70b4c0173533f6f803ec6bc8c2ed910cc468 (patch)
treefa625901840c68756b5e4f86e6373c28b6b9d43e /elf/dl-sysdep.c
parentff8a695b6d740e45b9e4b7ca454cdbca4f04ed7a (diff)
downloadglibc-171a70b4c0173533f6f803ec6bc8c2ed910cc468.tar.gz
glibc-171a70b4c0173533f6f803ec6bc8c2ed910cc468.tar.xz
glibc-171a70b4c0173533f6f803ec6bc8c2ed910cc468.zip
For PR 14055, add bounds check to _dl_show_auxv().
Diffstat (limited to 'elf/dl-sysdep.c')
-rw-r--r--elf/dl-sysdep.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c
index 1cb4460a02..ea505a646f 100644
--- a/elf/dl-sysdep.c
+++ b/elf/dl-sysdep.c
@@ -1,5 +1,5 @@
 /* Operating system support for run-time dynamic linker.  Generic Unix version.
-   Copyright (C) 1995-1998,2000-2008,2009,2010
+   Copyright (C) 1995-1998,2000-2010,2012
 	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -303,7 +303,9 @@ _dl_show_auxv (void)
 	};
       unsigned int idx = (unsigned int) (av->a_type - 2);
 
-      if ((unsigned int) av->a_type < 2u || auxvars[idx].form == ignore)
+      if ((unsigned int) av->a_type < 2u
+	  || (idx < sizeof (auxvars) / sizeof (auxvars[0])
+	      && auxvars[idx].form == ignore))
 	continue;
 
       assert (AT_NULL == 0);