From owner-svn-src-all@freebsd.org  Mon Jan 30 23:13:42 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 E0B71CC8E06;
 Mon, 30 Jan 2017 23:13:42 +0000 (UTC) (envelope-from jhb@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 B071414F4;
 Mon, 30 Jan 2017 23:13:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0UNDfPc022499;
 Mon, 30 Jan 2017 23:13:41 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0UNDf3h022498;
 Mon, 30 Jan 2017 23:13:41 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201701302313.v0UNDf3h022498@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 30 Jan 2017 23:13:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r313003 - head/libexec/rtld-elf/mips
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Jan 2017 23:13:43 -0000

Author: jhb
Date: Mon Jan 30 23:13:41 2017
New Revision: 313003
URL: https://svnweb.freebsd.org/changeset/base/313003

Log:
  Remove a duplicate store when performing REL32 relocations in rtld.
  
  The duplicate call to store_ptr() was added in r204687, but it should
  have no effect as it only stores an Elf_Sword and the later store_ptr()
  does a write that is at least as large if not larger.
  
  Reviewed by:	jmallett
  Obtained from:	CheriBSD (sort of)
  Sponsored by:	DARPA / AFRL

Modified:
  head/libexec/rtld-elf/mips/reloc.c

Modified: head/libexec/rtld-elf/mips/reloc.c
==============================================================================
--- head/libexec/rtld-elf/mips/reloc.c	Mon Jan 30 23:00:51 2017	(r313002)
+++ head/libexec/rtld-elf/mips/reloc.c	Mon Jan 30 23:13:41 2017	(r313003)
@@ -215,7 +215,6 @@ _rtld_relocate_nonplt_self(Elf_Dyn *dynp
 			sym = symtab + r_symndx;
 			assert(ELF_ST_BIND(sym->st_info) == STB_LOCAL);
 			val += relocbase;
-			store_ptr(where, val, sizeof(Elf_Sword));
 			dbg("REL32/L(%p) %p -> %p in <self>",
 			    where, (void *)old, (void *)val);
 			store_ptr(where, val, rlen);