From owner-svn-src-all@FreeBSD.ORG  Fri Aug 31 23:28:41 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9E5751065670;
	Fri, 31 Aug 2012 23:28:41 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 89A6C8FC18;
	Fri, 31 Aug 2012 23:28:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7VNSfNX012049;
	Fri, 31 Aug 2012 23:28:41 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7VNSfLK012047;
	Fri, 31 Aug 2012 23:28:41 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201208312328.q7VNSfLK012047@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 31 Aug 2012 23:28:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239962 - head/contrib/binutils/binutils
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2012 23:28:41 -0000

Author: dim
Date: Fri Aug 31 23:28:41 2012
New Revision: 239962
URL: http://svn.freebsd.org/changeset/base/239962

Log:
  Fix a twelve year old bug in readelf: when process_dynamic_segment()
  encounters a DT_RUNPATH entry, the global dynamic_info[] array is
  overrun, causing some other global variable to be overwritten.
  
  In my testcase, this was the section_headers variable, leading to
  segfaults or jemalloc assertions when it was freed later on.
  
  Thanks to Koop Mast for providing samples of a few "bad" .so files.
  
  MFC after:	1 week

Modified:
  head/contrib/binutils/binutils/readelf.c

Modified: head/contrib/binutils/binutils/readelf.c
==============================================================================
--- head/contrib/binutils/binutils/readelf.c	Fri Aug 31 22:37:08 2012	(r239961)
+++ head/contrib/binutils/binutils/readelf.c	Fri Aug 31 23:28:41 2012	(r239962)
@@ -174,7 +174,7 @@ static Elf_Internal_Syminfo *dynamic_sym
 static unsigned long dynamic_syminfo_offset;
 static unsigned int dynamic_syminfo_nent;
 static char program_interpreter[PATH_MAX];
-static bfd_vma dynamic_info[DT_JMPREL + 1];
+static bfd_vma dynamic_info[DT_ENCODING];
 static bfd_vma dynamic_info_DT_GNU_HASH;
 static bfd_vma version_info[16];
 static Elf_Internal_Ehdr elf_header;