From owner-svn-src-head@FreeBSD.ORG  Mon Dec 29 20:23:43 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5D38953F;
 Mon, 29 Dec 2014 20:23:43 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 49B6B3910;
 Mon, 29 Dec 2014 20:23:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBTKNhGe033701;
 Mon, 29 Dec 2014 20:23:43 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBTKNhvg033700;
 Mon, 29 Dec 2014 20:23:43 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201412292023.sBTKNhvg033700@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 29 Dec 2014 20:23:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r276374 - head/contrib/elftoolchain/libelf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Dec 2014 20:23:43 -0000

Author: emaste
Date: Mon Dec 29 20:23:42 2014
New Revision: 276374
URL: https://svnweb.freebsd.org/changeset/base/276374

Log:
  libelf: Do not read past end of buffer
  
  Previously a corrupt ELF file could read beyond the end of e_rawfile.
  
  Upstream elftoolchain ticket 462.  Found via the security/afl fuzzer.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/contrib/elftoolchain/libelf/elf_scn.c

Modified: head/contrib/elftoolchain/libelf/elf_scn.c
==============================================================================
--- head/contrib/elftoolchain/libelf/elf_scn.c	Mon Dec 29 19:38:12 2014	(r276373)
+++ head/contrib/elftoolchain/libelf/elf_scn.c	Mon Dec 29 20:23:42 2014	(r276374)
@@ -50,6 +50,7 @@ _libelf_load_section_headers(Elf *e, voi
 	Elf64_Ehdr *eh64;
 	int ec, swapbytes;
 	unsigned char *src;
+	unsigned char *rawend;
 	size_t fsz, i, shnum;
 	int (*xlator)(unsigned char *_d, size_t _dsz, unsigned char *_s,
 	    size_t _c, int _swap);
@@ -86,6 +87,7 @@ _libelf_load_section_headers(Elf *e, voi
 
 	swapbytes = e->e_byteorder != LIBELF_PRIVATE(byteorder);
 	src = e->e_rawfile + shoff;
+	rawend = e->e_rawfile + e->e_rawsize;
 
 	/*
 	 * If the file is using extended numbering then section #0
@@ -102,6 +104,8 @@ _libelf_load_section_headers(Elf *e, voi
 	}
 
 	for (; i < shnum; i++, src += fsz) {
+		if (src + sizeof(scn->s_shdr) > rawend)
+			return (0);
 		if ((scn = _libelf_allocate_scn(e, i)) == NULL)
 			return (0);