From owner-svn-src-head@freebsd.org  Thu Nov 23 14:30:43 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0E9B1DEE32C;
 Thu, 23 Nov 2017 14:30:43 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 CD0426D77F;
 Thu, 23 Nov 2017 14:30:42 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vANEUfxp038612;
 Thu, 23 Nov 2017 14:30:41 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vANEUfxp038611;
 Thu, 23 Nov 2017 14:30:41 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201711231430.vANEUfxp038611@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 23 Nov 2017 14:30:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326135 - head/contrib/binutils/bfd
X-SVN-Group: head
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: head/contrib/binutils/bfd
X-SVN-Commit-Revision: 326135
X-SVN-Commit-Repository: base
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.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Nov 2017 14:30:43 -0000

Author: emaste
Date: Thu Nov 23 14:30:41 2017
New Revision: 326135
URL: https://svnweb.freebsd.org/changeset/base/326135

Log:
  bfd: fix segfault in the ihex parser on malformed ihex file
  
  From binutils commit 0102ea8cec5fc509bba6c91df61b7ce23a799d32, made
  available under GPLv2 by Nick Clifton.
  
  PR:		198824
  MFC after:	1 week
  Security:	CVE-2014-8503

Modified:
  head/contrib/binutils/bfd/ihex.c

Modified: head/contrib/binutils/bfd/ihex.c
==============================================================================
--- head/contrib/binutils/bfd/ihex.c	Thu Nov 23 14:29:07 2017	(r326134)
+++ head/contrib/binutils/bfd/ihex.c	Thu Nov 23 14:30:41 2017	(r326135)
@@ -320,7 +320,7 @@ ihex_scan (bfd *abfd)
 	    {
 	      if (! ISHEX (buf[i]))
 		{
-		  ihex_bad_byte (abfd, lineno, hdr[i], error);
+		  ihex_bad_byte (abfd, lineno, buf[i], error);
 		  goto error_return;
 		}
 	    }