libelf: Make sure n * w doesn't overflow in elf_getarsym.

Signed-off-by: Mark Wielaard <mjw@redhat.com>

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index e03ee09f2867008c7ac9818104e87f2fcda02f43..4860530b85a8b6013e1991e4b3263b3ce3730934 100644 (file)
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-09  Mark Wielaard  <mjw@redhat.com>
+
+       * elf_getarsym.c (elf_getarsym): Make sure n * w doesn't overflow.
+
 2014-11-27  Mark Wielaard  <mjw@redhat.com>
 
        * Makefile.am (libelf.so): Use textrel_check.

diff --git a/libelf/elf_getarsym.c b/libelf/elf_getarsym.c
index 7325190ab243f40eaa40bdf0475c1d1a0ba4c8e9..ba88aa0aa74c255e8a32e7717686e9b864622779 100644 (file)
--- a/libelf/elf_getarsym.c
+++ b/libelf/elf_getarsym.c
@@ -186,7 +186,7 @@ elf_getarsym (elf, ptr)
 #if SIZE_MAX <= 4294967295U
          || n >= SIZE_MAX / sizeof (Elf_Arsym)
 #endif
-         || n * w > index_size)
+         || n > index_size / w)
        {
          /* This index table cannot be right since it does not fit into
             the file.  */