From owner-dev-commits-src-branches@freebsd.org Fri Jul 30 00:33:18 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0794C657C0E; Fri, 30 Jul 2021 00:33:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GbSzx61rNz4vLn; Fri, 30 Jul 2021 00:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B3C431B633; Fri, 30 Jul 2021 00:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16U0XHna043675; Fri, 30 Jul 2021 00:33:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16U0XHHu043674; Fri, 30 Jul 2021 00:33:17 GMT (envelope-from git) Date: Fri, 30 Jul 2021 00:33:17 GMT Message-Id: <202107300033.16U0XHHu043674@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 24c558ca3c04 - stable/13 - imgact_elf: Avoid redefining suword() MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 24c558ca3c04e23681ddefe13d0cd5f98bba9fac Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Jul 2021 00:33:18 -0000 The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=24c558ca3c04e23681ddefe13d0cd5f98bba9fac commit 24c558ca3c04e23681ddefe13d0cd5f98bba9fac Author: Mark Johnston AuthorDate: 2021-07-23 19:40:54 +0000 Commit: Mark Johnston CommitDate: 2021-07-30 00:32:58 +0000 imgact_elf: Avoid redefining suword() Otherwise this interferes with the definition for sanitizer interceptors. Sponsored by: The FreeBSD Foundation (cherry picked from commit ebf9886654f42718229011524a81e2b36e51f9b1) --- sys/kern/imgact_elf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 563629b747b5..9d039b914fb5 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -1345,7 +1345,7 @@ ret: return (error); } -#define suword __CONCAT(suword, __ELF_WORD_SIZE) +#define elf_suword __CONCAT(suword, __ELF_WORD_SIZE) int __elfN(freebsd_copyout_auxargs)(struct image_params *imgp, uintptr_t base) @@ -1418,7 +1418,7 @@ __elfN(freebsd_fixup)(uintptr_t *stack_base, struct image_params *imgp) base = (Elf_Addr *)*stack_base; base--; - if (suword(base, imgp->args->argc) == -1) + if (elf_suword(base, imgp->args->argc) == -1) return (EFAULT); *stack_base = (uintptr_t)base; return (0);