From owner-svn-src-stable@freebsd.org  Mon Apr 11 14:45:37 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 3554CB0CF58;
 Mon, 11 Apr 2016 14:45:37 +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 059AD104D;
 Mon, 11 Apr 2016 14:45:36 +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 u3BEjajJ080132;
 Mon, 11 Apr 2016 14:45:36 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3BEja84080131;
 Mon, 11 Apr 2016 14:45:36 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201604111445.u3BEja84080131@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: Mon, 11 Apr 2016 14:45:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r297823 - stable/10/lib/libelf
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Apr 2016 14:45:37 -0000

Author: emaste
Date: Mon Apr 11 14:45:36 2016
New Revision: 297823
URL: https://svnweb.freebsd.org/changeset/base/297823

Log:
  MFC r296685: libelf: correct byte count in cross-endian note translation
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/lib/libelf/libelf_convert.m4

Modified: stable/10/lib/libelf/libelf_convert.m4
==============================================================================
--- stable/10/lib/libelf/libelf_convert.m4	Mon Apr 11 14:44:18 2016	(r297822)
+++ stable/10/lib/libelf/libelf_convert.m4	Mon Apr 11 14:45:36 2016	(r297823)
@@ -810,6 +810,7 @@ libelf_cvt_NOTE_tof(char *dst, size_t ds
 		WRITE_WORD(dst, type);
 
 		src += sizeof(Elf_Note);
+		count -= sizeof(Elf_Note);
 
 		if (count < sz)
 			sz = count;