--- elfutils/libelf/ChangeLog

+++ elfutils/libelf/ChangeLog

@@ -663,10 +663,53 @@

 	If section content hasn't been read yet, do it before looking for the

 	block size.  If no section data present, infer size of section header.

+2005-05-14  Jakub Jelinek  <jakub@redhat.com>

+

+	* libelfP.h (INVALID_NDX): Define.

+	* gelf_getdyn.c (gelf_getdyn): Use it.  Remove ndx < 0 test if any.

+	* gelf_getlib.c (gelf_getlib): Likewise.

+	* gelf_getmove.c (gelf_getmove): Likewise.

+	* gelf_getrel.c (gelf_getrel): Likewise.

+	* gelf_getrela.c (gelf_getrela): Likewise.

+	* gelf_getsym.c (gelf_getsym): Likewise.

+	* gelf_getsyminfo.c (gelf_getsyminfo): Likewise.

+	* gelf_getsymshndx.c (gelf_getsymshndx): Likewise.

+	* gelf_getversym.c (gelf_getversym): Likewise.

+	* gelf_update_dyn.c (gelf_update_dyn): Likewise.

+	* gelf_update_lib.c (gelf_update_lib): Likewise.

+	* gelf_update_move.c (gelf_update_move): Likewise.

+	* gelf_update_rel.c (gelf_update_rel): Likewise.

+	* gelf_update_rela.c (gelf_update_rela): Likewise.

+	* gelf_update_sym.c (gelf_update_sym): Likewise.

+	* gelf_update_syminfo.c (gelf_update_syminfo): Likewise.

+	* gelf_update_symshndx.c (gelf_update_symshndx): Likewise.

+	* gelf_update_versym.c (gelf_update_versym): Likewise.

+	* elf_newscn.c (elf_newscn): Check for overflow.

+	* elf32_updatefile.c (__elfw2(LIBELFBITS,updatemmap)): Likewise.

+	(__elfw2(LIBELFBITS,updatefile)): Likewise.

+	* elf_begin.c (file_read_elf): Likewise.

+	* elf32_newphdr.c (elfw2(LIBELFBITS,newphdr)): Likewise.

+	* elf_getarsym.c (elf_getarsym): Likewise.

+	* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)): Likewise.

 2005-05-11  Ulrich Drepper  <drepper@redhat.com>

 	* elf.h: Update again.

+2005-05-17  Jakub Jelinek  <jakub@redhat.com>

+

+	* elf32_getphdr.c (elfw2(LIBELFBITS,getphdr)): Check if program header

+	table fits into object's bounds.

+	* elf_getshstrndx.c (elf_getshstrndx): Add elf->start_offset to

+	elf->map_address.  Check if first section header fits into object's

+	bounds.

+	* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)):

+	Check if section header table fits into object's bounds.

+	* elf_begin.c (get_shnum): Ensure section headers fits into

+	object's bounds.

+	(file_read_elf): Make sure scncnt is small enough to allocate both

+	ElfXX_Shdr and Elf_Scn array.  Make sure section and program header

+	tables fit into object's bounds.  Avoid memory leak on failure.

+

 2005-05-09  Ulrich Drepper  <drepper@redhat.com>

 	* elf.h: Update from glibc.

--- elfutils/libelf/elf32_getphdr.c

+++ elfutils/libelf/elf32_getphdr.c

@@ -114,6 +114,16 @@ __elfw2(LIBELFBITS,getphdr_wrlock) (elf)

       if (elf->map_address != NULL)

 	{

+	  /* First see whether the information in the ELF header is

+	     valid and it does not ask for too much.  */

+	  if (unlikely (ehdr->e_phoff >= elf->maximum_size)

+	      || unlikely (elf->maximum_size - ehdr->e_phoff < size))

+	    {

+	      /* Something is wrong.  */

+	      __libelf_seterrno (ELF_E_INVALID_PHDR);

+	      goto out;

+	    }

+

 	  /* All the data is already mapped.  Use it.  */

 	  void *file_phdr = ((char *) elf->map_address

 			     + elf->start_offset + ehdr->e_phoff);

--- elfutils/libelf/elf32_getshdr.c

+++ elfutils/libelf/elf32_getshdr.c

@@ -1,5 +1,5 @@

 /* Return section header.

-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2007, 2009 Red Hat, Inc.

+   Copyright (C) 1998-2009 Red Hat, Inc.

    This file is part of Red Hat elfutils.

    Written by Ulrich Drepper <drepper@redhat.com>, 1998.

@@ -81,7 +81,8 @@ load_shdr_wrlock (Elf_Scn *scn)

     goto out;

   size_t shnum;

-  if (__elf_getshdrnum_rdlock (elf, &shnum) != 0)

+  if (__elf_getshdrnum_rdlock (elf, &shnum) != 0

+      || shnum > SIZE_MAX / sizeof (ElfW2(LIBELFBITS,Shdr)))

     goto out;

   size_t size = shnum * sizeof (ElfW2(LIBELFBITS,Shdr));

@@ -98,6 +99,16 @@ load_shdr_wrlock (Elf_Scn *scn)

   if (elf->map_address != NULL)

     {

+      /* First see whether the information in the ELF header is

+	 valid and it does not ask for too much.  */

+      if (unlikely (ehdr->e_shoff >= elf->maximum_size)

+	  || unlikely (elf->maximum_size - ehdr->e_shoff < size))

+	{

+	  /* Something is wrong.  */

+	  __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);

+	  goto free_and_out;

+	}

+

       ElfW2(LIBELFBITS,Shdr) *notcvt;

       /* All the data is already mapped.  If we could use it

--- elfutils/libelf/elf32_newphdr.c

+++ elfutils/libelf/elf32_newphdr.c

@@ -135,6 +135,12 @@ elfw2(LIBELFBITS,newphdr) (elf, count)

 	   || count == PN_XNUM

 	   || elf->state.ELFW(elf,LIBELFBITS).phdr == NULL)

     {

+      if (unlikely (count > SIZE_MAX / sizeof (ElfW2(LIBELFBITS,Phdr))))

+	{

+	  result = NULL;

+	  goto out;

+	}

+

       /* Allocate a new program header with the appropriate number of

 	 elements.  */

       result = (ElfW2(LIBELFBITS,Phdr) *)

--- elfutils/libelf/elf32_updatefile.c

+++ elfutils/libelf/elf32_updatefile.c

@@ -223,6 +223,9 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf

   /* Write all the sections.  Well, only those which are modified.  */

   if (shnum > 0)

     {

+      if (unlikely (shnum > SIZE_MAX / sizeof (Elf_Scn *)))

+ 	return 1;

+

       Elf_ScnList *list = &elf->state.ELFW(elf,LIBELFBITS).scns;

       Elf_Scn **scns = (Elf_Scn **) alloca (shnum * sizeof (Elf_Scn *));

       char *const shdr_start = ((char *) elf->map_address + elf->start_offset

@@ -645,6 +648,10 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf

   /* Write all the sections.  Well, only those which are modified.  */

   if (shnum > 0)

     {

+      if (unlikely (shnum > SIZE_MAX / (sizeof (Elf_Scn *)

+					+ sizeof (ElfW2(LIBELFBITS,Shdr)))))

+	return 1;

+

       off_t shdr_offset = elf->start_offset + ehdr->e_shoff;

 #if EV_NUM != 2

       xfct_t shdr_fctp = __elf_xfctstom[__libelf_version - 1][EV_CURRENT - 1][ELFW(ELFCLASS, LIBELFBITS) - 1][ELF_T_SHDR];

--- elfutils/libelf/elf_begin.c

+++ elfutils/libelf/elf_begin.c

@@ -165,7 +165,8 @@ get_shnum (void *map_address, unsigned c

       if (unlikely (result == 0) && ehdr.e32->e_shoff != 0)

 	{

-	  if (ehdr.e32->e_shoff + sizeof (Elf32_Shdr) > maxsize)

+	  if (unlikely (ehdr.e32->e_shoff >= maxsize)

+	      || unlikely (maxsize - ehdr.e32->e_shoff < sizeof (Elf32_Shdr)))

 	    /* Cannot read the first section header.  */

 	    return 0;

@@ -213,7 +214,8 @@ get_shnum (void *map_address, unsigned c

       if (unlikely (result == 0) && ehdr.e64->e_shoff != 0)

 	{

-	  if (ehdr.e64->e_shoff + sizeof (Elf64_Shdr) > maxsize)

+	  if (unlikely (ehdr.e64->e_shoff >= maxsize)

+	      || unlikely (ehdr.e64->e_shoff + sizeof (Elf64_Shdr) > maxsize))

 	    /* Cannot read the first section header.  */

 	    return 0;

@@ -285,6 +287,15 @@ file_read_elf (int fildes, void *map_add

     /* Could not determine the number of sections.  */

     return NULL;

+  /* Check for too many sections.  */

+  if (e_ident[EI_CLASS] == ELFCLASS32)

+    {

+      if (scncnt > SIZE_MAX / (sizeof (Elf_Scn) + sizeof (Elf32_Shdr)))

+	return NULL;

+    }

+  else if (scncnt > SIZE_MAX / (sizeof (Elf_Scn) + sizeof (Elf64_Shdr)))

+    return NULL;

+

   /* We can now allocate the memory.  Even if there are no section headers,

      we allocate space for a zeroth section in case we need it later.  */

   const size_t scnmax = (scncnt ?: (cmd == ELF_C_RDWR || cmd == ELF_C_RDWR_MMAP)

@@ -324,6 +335,16 @@ file_read_elf (int fildes, void *map_add

 	{

 	  /* We can use the mmapped memory.  */

 	  elf->state.elf32.ehdr = ehdr;

+

+	  if (unlikely (ehdr->e_shoff >= maxsize)

+	      || unlikely (maxsize - ehdr->e_shoff

+			   < scncnt * sizeof (Elf32_Shdr)))

+	    {

+	    free_and_out:

+	      free (elf);

+	      __libelf_seterrno (ELF_E_INVALID_FILE);

+	      return NULL;

+	    }

 	  elf->state.elf32.shdr

 	    = (Elf32_Shdr *) ((char *) ehdr + ehdr->e_shoff);

@@ -410,6 +431,11 @@ file_read_elf (int fildes, void *map_add

 	{

 	  /* We can use the mmapped memory.  */

 	  elf->state.elf64.ehdr = ehdr;

+

+	  if (unlikely (ehdr->e_shoff >= maxsize)

+	      || unlikely (ehdr->e_shoff

+			   + scncnt * sizeof (Elf32_Shdr) > maxsize))

+	    goto free_and_out;

 	  elf->state.elf64.shdr

 	    = (Elf64_Shdr *) ((char *) ehdr + ehdr->e_shoff);

--- elfutils/libelf/elf_getarsym.c

+++ elfutils/libelf/elf_getarsym.c

@@ -179,6 +179,9 @@ elf_getarsym (elf, ptr)

       size_t index_size = atol (tmpbuf);

       if (SARMAG + sizeof (struct ar_hdr) + index_size > elf->maximum_size

+#if SIZE_MAX <= 4294967295U

+	  || n >= SIZE_MAX / sizeof (Elf_Arsym)

+#endif

 	  || n * sizeof (uint32_t) > index_size)

 	{

 	  /* This index table cannot be right since it does not fit into

--- elfutils/libelf/elf_getshdrstrndx.c

+++ elfutils/libelf/elf_getshdrstrndx.c

@@ -125,10 +125,25 @@ elf_getshdrstrndx (elf, dst)

 	      if (elf->map_address != NULL

 		  && elf->state.elf32.ehdr->e_ident[EI_DATA] == MY_ELFDATA

 		  && (ALLOW_UNALIGNED

-		      || (((size_t) ((char *) elf->map_address + offset))

+		      || (((size_t) ((char *) elf->map_address

+			   + elf->start_offset + offset))

 			  & (__alignof__ (Elf32_Shdr) - 1)) == 0))

-		/* We can directly access the memory.  */

-		num = ((Elf32_Shdr *) (elf->map_address + offset))->sh_link;

+		{

+		  /* First see whether the information in the ELF header is

+		     valid and it does not ask for too much.  */

+		  if (unlikely (elf->maximum_size - offset

+				< sizeof (Elf32_Shdr)))

+		    {

+		      /* Something is wrong.  */

+		      __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);

+		      result = -1;

+		      goto out;

+		    }

+

+		  /* We can directly access the memory.  */

+		  num = ((Elf32_Shdr *) (elf->map_address + elf->start_offset

+					 + offset))->sh_link;

+		}

 	      else

 		{

 		  /* We avoid reading in all the section headers.  Just read

@@ -163,10 +178,25 @@ elf_getshdrstrndx (elf, dst)

 	      if (elf->map_address != NULL

 		  && elf->state.elf64.ehdr->e_ident[EI_DATA] == MY_ELFDATA

 		  && (ALLOW_UNALIGNED

-		      || (((size_t) ((char *) elf->map_address + offset))

+		      || (((size_t) ((char *) elf->map_address

+			   + elf->start_offset + offset))

 			  & (__alignof__ (Elf64_Shdr) - 1)) == 0))

-		/* We can directly access the memory.  */

-		num = ((Elf64_Shdr *) (elf->map_address + offset))->sh_link;

+		{

+		  /* First see whether the information in the ELF header is

+		     valid and it does not ask for too much.  */

+		  if (unlikely (elf->maximum_size - offset

+				< sizeof (Elf64_Shdr)))

+		    {

+		      /* Something is wrong.  */

+		      __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);

+		      result = -1;

+		      goto out;

+		    }

+

+		  /* We can directly access the memory.  */

+		  num = ((Elf64_Shdr *) (elf->map_address + elf->start_offset

+					 + offset))->sh_link;

+		}

 	      else

 		{

 		  /* We avoid reading in all the section headers.  Just read

--- elfutils/libelf/elf_newscn.c

+++ elfutils/libelf/elf_newscn.c

@@ -104,10 +104,18 @@ elf_newscn (elf)

   else

     {

       /* We must allocate a new element.  */

-      Elf_ScnList *newp;

+      Elf_ScnList *newp = NULL;

       assert (elf->state.elf.scnincr > 0);

+      if (

+#if SIZE_MAX <= 4294967295U

+	  likely (elf->state.elf.scnincr

+		  < SIZE_MAX / 2 / sizeof (Elf_Scn) - sizeof (Elf_ScnList))

+#else

+	  1

+#endif

+	  )

       newp = (Elf_ScnList *) calloc (sizeof (Elf_ScnList)

 				     + ((elf->state.elf.scnincr *= 2)

 					* sizeof (Elf_Scn)), 1);

--- elfutils/libelf/gelf_getdyn.c

+++ elfutils/libelf/gelf_getdyn.c

@@ -1,5 +1,5 @@

 /* Get information from dynamic table at the given index.

-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.

+   Copyright (C) 2000-2009 Red Hat, Inc.

    This file is part of Red Hat elfutils.

    Written by Ulrich Drepper <drepper@redhat.com>, 2000.

@@ -93,7 +93,7 @@ gelf_getdyn (data, ndx, dst)

 	 table entries has to be adopted.  The user better has provided

 	 a buffer where we can store the information.  While copying the

 	 data we are converting the format.  */

-      if (unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size))

+      if (INVALID_NDX (ndx, Elf32_Dyn, &data_scn->d))

 	{

 	  __libelf_seterrno (ELF_E_INVALID_INDEX);

 	  goto out;

@@ -114,7 +114,7 @@ gelf_getdyn (data, ndx, dst)

       /* The data is already in the correct form.  Just make sure the

 	 index is OK.  */

-      if (unlikely ((ndx + 1) * sizeof (GElf_Dyn) > data_scn->d.d_size))

+      if (INVALID_NDX (ndx, GElf_Dyn, &data_scn->d))

 	{

 	  __libelf_seterrno (ELF_E_INVALID_INDEX);

 	  goto out;

--- elfutils/libelf/gelf_getlib.c

+++ elfutils/libelf/gelf_getlib.c

@@ -1,5 +1,5 @@

 /* Get library from table at the given index.

-   Copyright (C) 2004 Red Hat, Inc.

+   Copyright (C) 2004-2009 Red Hat, Inc.

    This file is part of Red Hat elfutils.

    Written by Ulrich Drepper <drepper@redhat.com>, 2004.

@@ -86,7 +86,7 @@ gelf_getlib (data, ndx, dst)

   /* The data is already in the correct form.  Just make sure the

      index is OK.  */

   GElf_Lib *result = NULL;

-  if (unlikely ((ndx + 1) * sizeof (GElf_Lib) > data->d_size))

+  if (INVALID_NDX (ndx, GElf_Lib, data))

     __libelf_seterrno (ELF_E_INVALID_INDEX);

   else

     {

--- elfutils/libelf/gelf_getmove.c

+++ elfutils/libelf/gelf_getmove.c

@@ -1,5 +1,5 @@

 /* Get move structure at the given index.

-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.

+   Copyright (C) 2000-2009 Red Hat, Inc.

    This file is part of Red Hat elfutils.

    Written by Ulrich Drepper <drepper@redhat.com>, 2000.

@@ -83,7 +83,7 @@ gelf_getmove (data, ndx, dst)

   /* The data is already in the correct form.  Just make sure the

      index is OK.  */

-  if (unlikely ((ndx + 1) * sizeof (GElf_Move) > data->d_size))

+  if (INVALID_NDX (ndx, GElf_Move, data))

     {

       __libelf_seterrno (ELF_E_INVALID_INDEX);

       goto out;

--- elfutils/libelf/gelf_getrela.c

+++ elfutils/libelf/gelf_getrela.c

@@ -1,5 +1,5 @@

 /* Get RELA relocation information at given index.

-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.

+   Copyright (C) 2000-2009 Red Hat, Inc.

    This file is part of Red Hat elfutils.

    Written by Ulrich Drepper <drepper@redhat.com>, 2000.

@@ -71,12 +71,6 @@ gelf_getrela (data, ndx, dst)

   if (data_scn == NULL)

     return NULL;

-  if (unlikely (ndx < 0))

-    {

-      __libelf_seterrno (ELF_E_INVALID_INDEX);

-      return NULL;

-    }

-

   if (unlikely (data_scn->d.d_type != ELF_T_RELA))

     {

       __libelf_seterrno (ELF_E_INVALID_HANDLE);

@@ -93,7 +87,7 @@ gelf_getrela (data, ndx, dst)

   if (scn->elf->class == ELFCLASS32)

     {

       /* We have to convert the data.  */

-      if (unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size))

+      if (INVALID_NDX (ndx, Elf32_Rela, &data_scn->d))

 	{

 	  __libelf_seterrno (ELF_E_INVALID_INDEX);

 	  result = NULL;

@@ -114,7 +108,7 @@ gelf_getrela (data, ndx, dst)

     {

       /* Simply copy the data after we made sure we are actually getting

 	 correct data.  */

-      if (unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size))

+      if (INVALID_NDX (ndx, Elf64_Rela, &data_scn->d))

 	{

 	  __libelf_seterrno (ELF_E_INVALID_INDEX);

 	  result = NULL;

--- elfutils/libelf/gelf_getrel.c

+++ elfutils/libelf/gelf_getrel.c

@@ -1,5 +1,5 @@

 /* Get REL relocation information at given index.

-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.

+   Copyright (C) 2000-2009 Red Hat, Inc.

    This file is part of Red Hat elfutils.

    Written by Ulrich Drepper <drepper@redhat.com>, 2000.

@@ -71,12 +71,6 @@ gelf_getrel (data, ndx, dst)

   if (data_scn == NULL)

     return NULL;

-  if (unlikely (ndx < 0))

-    {

-      __libelf_seterrno (ELF_E_INVALID_INDEX);

-      return NULL;

-    }

-

   if (unlikely (data_scn->d.d_type != ELF_T_REL))

     {

       __libelf_seterrno (ELF_E_INVALID_HANDLE);

@@ -93,7 +87,7 @@ gelf_getrel (data, ndx, dst)

   if (scn->elf->class == ELFCLASS32)

     {

       /* We have to convert the data.  */

-      if (unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))

+      if (INVALID_NDX (ndx, Elf32_Rel, &data_scn->d))

 	{

 	  __libelf_seterrno (ELF_E_INVALID_INDEX);

 	  result = NULL;

@@ -113,7 +107,7 @@ gelf_getrel (data, ndx, dst)

     {

       /* Simply copy the data after we made sure we are actually getting

 	 correct data.  */

-      if (unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))

+      if (INVALID_NDX (ndx, Elf64_Rel, &data_scn->d))

 	{

 	  __libelf_seterrno (ELF_E_INVALID_INDEX);

 	  result = NULL;

--- elfutils/libelf/gelf_getsym.c

+++ elfutils/libelf/gelf_getsym.c

@@ -1,5 +1,5 @@

 /* Get symbol information from symbol table at the given index.

-   Copyright (C) 1999, 2000, 2001, 2002 Red Hat, Inc.

+   Copyright (C) 1999-2009 Red Hat, Inc.

    This file is part of Red Hat elfutils.

    Written by Ulrich Drepper <drepper@redhat.com>, 1999.

@@ -90,7 +90,7 @@ gelf_getsym (data, ndx, dst)

 	 table entries has to be adopted.  The user better has provided

 	 a buffer where we can store the information.  While copying the

 	 data we are converting the format.  */

-      if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data->d_size))

+      if (INVALID_NDX (ndx, Elf32_Sym, data))

 	{

 	  __libelf_seterrno (ELF_E_INVALID_INDEX);

 	  goto out;

@@ -119,7 +119,7 @@ gelf_getsym (data, ndx, dst)

       /* The data is already in the correct form.  Just make sure the

 	 index is OK.  */

-      if (unlikely ((ndx + 1) * sizeof (GElf_Sym) > data->d_size))

+      if (INVALID_NDX (ndx, GElf_Sym, data))

 	{

 	  __libelf_seterrno (ELF_E_INVALID_INDEX);

 	  goto out;

--- elfutils/libelf/gelf_getsyminfo.c

+++ elfutils/libelf/gelf_getsyminfo.c

@@ -1,5 +1,5 @@

 /* Get additional symbol information from symbol table at the given index.

-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.

+   Copyright (C) 2000-2009 Red Hat, Inc.

    This file is part of Red Hat elfutils.

    Written by Ulrich Drepper <drepper@redhat.com>, 2000.

@@ -84,7 +84,7 @@ gelf_getsyminfo (data, ndx, dst)

   /* The data is already in the correct form.  Just make sure the

      index is OK.  */

-  if (unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data->d_size))

+  if (INVALID_NDX (ndx, GElf_Syminfo, data))

     {

       __libelf_seterrno (ELF_E_INVALID_INDEX);

       goto out;

--- elfutils/libelf/gelf_getsymshndx.c

+++ elfutils/libelf/gelf_getsymshndx.c

@@ -1,6 +1,6 @@

 /* Get symbol information and separate section index from symbol table

    at the given index.

-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.

+   Copyright (C) 2000-2009 Red Hat, Inc.

    This file is part of Red Hat elfutils.

    Written by Ulrich Drepper <drepper@redhat.com>, 2000.

@@ -90,7 +90,7 @@ gelf_getsymshndx (symdata, shndxdata, nd

      section index table.  */

   if (likely (shndxdata_scn != NULL))

     {

-      if (unlikely ((ndx + 1) * sizeof (Elf32_Word) > shndxdata_scn->d.d_size))

+      if (INVALID_NDX (ndx, Elf32_Word, &shndxdata_scn->d))

 	{

 	  __libelf_seterrno (ELF_E_INVALID_INDEX);

 	  goto out;

@@ -110,7 +110,7 @@ gelf_getsymshndx (symdata, shndxdata, nd

 	 table entries has to be adopted.  The user better has provided

 	 a buffer where we can store the information.  While copying the

 	 data we are converting the format.  */

-      if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata->d_size))

+      if (INVALID_NDX (ndx, Elf32_Sym, symdata))

 	{

 	  __libelf_seterrno (ELF_E_INVALID_INDEX);

 	  goto out;

@@ -139,7 +139,7 @@ gelf_getsymshndx (symdata, shndxdata, nd

       /* The data is already in the correct form.  Just make sure the

 	 index is OK.  */

-      if (unlikely ((ndx + 1) * sizeof (GElf_Sym) > symdata->d_size))

+      if (INVALID_NDX (ndx, GElf_Sym, symdata))

 	{

 	  __libelf_seterrno (ELF_E_INVALID_INDEX);

 	  goto out;

--- elfutils/libelf/gelf_getversym.c

+++ elfutils/libelf/gelf_getversym.c

@@ -1,5 +1,5 @@

 /* Get symbol version information at the given index.

-   Copyright (C) 1999, 2000, 2001, 2002 Red Hat, Inc.

+   Copyright (C) 1999-2009 Red Hat, Inc.

    This file is part of Red Hat elfutils.

    Written by Ulrich Drepper <drepper@redhat.com>, 1999.

@@ -92,7 +92,7 @@ gelf_getversym (data, ndx, dst)

   /* The data is already in the correct form.  Just make sure the

      index is OK.  */

-  if (unlikely ((ndx + 1) * sizeof (GElf_Versym) > data->d_size))

+  if (INVALID_NDX (ndx, GElf_Versym, data))

     {

       __libelf_seterrno (ELF_E_INVALID_INDEX);

       result = NULL;

--- elfutils/libelf/gelf_update_dyn.c

+++ elfutils/libelf/gelf_update_dyn.c

@@ -1,5 +1,5 @@

 /* Update information in dynamic table at the given index.

-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.

+   Copyright (C) 2000-2009 Red Hat, Inc.

    This file is part of Red Hat elfutils.

    Written by Ulrich Drepper <drepper@redhat.com>, 2000.

@@ -71,12 +71,6 @@ gelf_update_dyn (data, ndx, src)

   if (data == NULL)

     return 0;

-  if (unlikely (ndx < 0))

-    {

-      __libelf_seterrno (ELF_E_INVALID_INDEX);

-      return 0;

-    }

-

   if (unlikely (data_scn->d.d_type != ELF_T_DYN))

     {

       /* The type of the data better should match.  */

@@ -102,7 +96,7 @@ gelf_update_dyn (data, ndx, src)

 	}

       /* Check whether we have to resize the data buffer.  */

-      if (unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size))

+      if (INVALID_NDX (ndx, Elf32_Dyn, &data_scn->d))

 	{

 	  __libelf_seterrno (ELF_E_INVALID_INDEX);

 	  goto out;

@@ -116,7 +110,7 @@ gelf_update_dyn (data, ndx, src)

   else

     {

       /* Check whether we have to resize the data buffer.  */

-      if (unlikely ((ndx + 1) * sizeof (Elf64_Dyn) > data_scn->d.d_size))

+      if (INVALID_NDX (ndx, Elf64_Dyn, &data_scn->d))

 	{

 	  __libelf_seterrno (ELF_E_INVALID_INDEX);

 	  goto out;

--- elfutils/libelf/gelf_update_lib.c

+++ elfutils/libelf/gelf_update_lib.c

@@ -1,5 +1,5 @@

 /* Update library in table at the given index.

-   Copyright (C) 2004 Red Hat, Inc.

+   Copyright (C) 2004-2009 Red Hat, Inc.

    This file is part of Red Hat elfutils.

    Written by Ulrich Drepper <drepper@redhat.com>, 2004.

@@ -68,12 +68,6 @@ gelf_update_lib (data, ndx, src)

   if (data == NULL)

     return 0;

-  if (unlikely (ndx < 0))

-    {

-      __libelf_seterrno (ELF_E_INVALID_INDEX);

-      return 0;

-    }

-

   Elf_Data_Scn *data_scn = (Elf_Data_Scn *) data;

   if (unlikely (data_scn->d.d_type != ELF_T_LIB))

     {

@@ -87,7 +81,7 @@ gelf_update_lib (data, ndx, src)

   /* Check whether we have to resize the data buffer.  */

   int result = 0;

-  if (unlikely ((ndx + 1) * sizeof (Elf64_Lib) > data_scn->d.d_size))

+  if (INVALID_NDX (ndx, Elf64_Lib, &data_scn->d))

     __libelf_seterrno (ELF_E_INVALID_INDEX);

   else

     {

--- elfutils/libelf/gelf_update_move.c

+++ elfutils/libelf/gelf_update_move.c

@@ -1,5 +1,5 @@

 /* Update move structure at the given index.

-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.

+   Copyright (C) 2000-2009 Red Hat, Inc.

    This file is part of Red Hat elfutils.

    Written by Ulrich Drepper <drepper@redhat.com>, 2000.

@@ -75,8 +75,7 @@ gelf_update_move (data, ndx, src)

   assert (sizeof (GElf_Move) == sizeof (Elf64_Move));

   /* Check whether we have to resize the data buffer.  */

-  if (unlikely (ndx < 0)

-      || unlikely ((ndx + 1) * sizeof (GElf_Move) > data_scn->d.d_size))

+  if (INVALID_NDX (ndx, GElf_Move, &data_scn->d))

     {

       __libelf_seterrno (ELF_E_INVALID_INDEX);

       return 0;

--- elfutils/libelf/gelf_update_rela.c

+++ elfutils/libelf/gelf_update_rela.c

@@ -1,5 +1,5 @@

 /* Update RELA relocation information at given index.

-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.

+   Copyright (C) 2000-2009 Red Hat, Inc.

    This file is part of Red Hat elfutils.

    Written by Ulrich Drepper <drepper@redhat.com>, 2000.

@@ -68,12 +68,6 @@ gelf_update_rela (Elf_Data *dst, int ndx

   if (dst == NULL)

     return 0;

-  if (unlikely (ndx < 0))

-    {

-      __libelf_seterrno (ELF_E_INVALID_INDEX);

-      return 0;

-    }

-

   if (unlikely (data_scn->d.d_type != ELF_T_RELA))

     {

       /* The type of the data better should match.  */

@@ -101,7 +95,7 @@ gelf_update_rela (Elf_Data *dst, int ndx

 	}

       /* Check whether we have to resize the data buffer.  */

-      if (unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size))

+      if (INVALID_NDX (ndx, Elf32_Rela, &data_scn->d))

 	{

 	  __libelf_seterrno (ELF_E_INVALID_INDEX);

 	  goto out;

@@ -117,7 +111,7 @@ gelf_update_rela (Elf_Data *dst, int ndx

   else

     {

       /* Check whether we have to resize the data buffer.  */

-      if (unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size))

+      if (INVALID_NDX (ndx, Elf64_Rela, &data_scn->d))

 	{

 	  __libelf_seterrno (ELF_E_INVALID_INDEX);

 	  goto out;

--- elfutils/libelf/gelf_update_rel.c

+++ elfutils/libelf/gelf_update_rel.c

@@ -1,5 +1,5 @@

 /* Update REL relocation information at given index.

-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.

+   Copyright (C) 2000-2009 Red Hat, Inc.

    This file is part of Red Hat elfutils.

    Written by Ulrich Drepper <drepper@redhat.com>, 2000.

@@ -68,12 +68,6 @@ gelf_update_rel (Elf_Data *dst, int ndx,

   if (dst == NULL)

     return 0;

-  if (unlikely (ndx < 0))

-    {

-      __libelf_seterrno (ELF_E_INVALID_INDEX);

-      return 0;

-    }

-

   if (unlikely (data_scn->d.d_type != ELF_T_REL))

     {

       /* The type of the data better should match.  */

@@ -99,7 +93,7 @@ gelf_update_rel (Elf_Data *dst, int ndx,

 	}

       /* Check whether we have to resize the data buffer.  */

-      if (unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))

+      if (INVALID_NDX (ndx, Elf32_Rel, &data_scn->d))

 	{

 	  __libelf_seterrno (ELF_E_INVALID_INDEX);

 	  goto out;

@@ -114,7 +108,7 @@ gelf_update_rel (Elf_Data *dst, int ndx,

   else

     {