From nobody Sun Dec 12 18:07:10 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5144D18E6D45; Sun, 12 Dec 2021 18:07:11 +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 4JBszg0Vpnz3hbv; Sun, 12 Dec 2021 18:07:11 +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 E28BD2576E; Sun, 12 Dec 2021 18:07:10 +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 1BCI7AqX051461; Sun, 12 Dec 2021 18:07:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BCI7APo051460; Sun, 12 Dec 2021 18:07:10 GMT (envelope-from git) Date: Sun, 12 Dec 2021 18:07:10 GMT Message-Id: <202112121807.1BCI7APo051460@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e499988f0cc4 - main - exec_elf: use intermediate u_long variable to correct mismatched type List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e499988f0cc45ad2e21573b6d11c9cefdd37608d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639332431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wPzM8grIx6FZ9DVbfO9C0k8zyHwzlAOCGA2IxKvxMTc=; b=qipy1iJiSrxf9IIS2sRB6Uq+Qba/JBV5AWnDpp+gF7o7a4VCcANGWIyJe9j5A4ssfH125X 0dR83R2t2zruKBijTxn8XPzetetYADsh20Y67B/iq1KF6TreiHsyy69NgqGKwFbNmKHkkf 7FKqC8gfnH1RiXTzNLedX1zrnhQWEwCN8wm+iKOUTnqxUV82H6AwnIerZG6i5alnci9nu6 bN+xGTynH1C0D7GpSltB3fU4ar5N431/BTz8TU6guRv+745ELnfmG8qtFsxrUmwacL06u4 tEURZEIRRu7XniIM7Gp7jA6isN7k06kkU/WHo19O5iCTFPMdxbeX4Zr42QqExg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639332431; a=rsa-sha256; cv=none; b=pbCvqk8ofCsKOKy44FC344FiOx10JrHxSCdx9Z1FDPk1IsGajFv9kAF1WsnrdoEU3Bko5q aoeKA8F3I6Y4PpFlwmRWyxmYjZ0E2YKjNgn9nXaAgSRPvP8PqeYYoxvhctOtkZUq2r49g3 GmrczjYoVn50XCSxxhlQXRBBRfvHjuTU6ddjiN722Sz6EzAtRDSSX6l+x8+EUEIEL5Mx9h YrEut8rUGodQ1kytCELlo2wOTBnXxutlspb1RHtdUfe+EZTRKJYcm+5Tk+3oahewjr+n8k 6FDw+ERdSTkD7ll2J/NrpQOH6/4ckOMme49uyyccqbtGF4g8PFgB3UtOM3CdvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e499988f0cc45ad2e21573b6d11c9cefdd37608d commit e499988f0cc45ad2e21573b6d11c9cefdd37608d Author: Konstantin Belousov AuthorDate: 2021-12-12 16:47:26 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-12 18:07:04 +0000 exec_elf: use intermediate u_long variable to correct mismatched type vm_offset_t * vs. u_long * Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/kern/imgact_elf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index b926bc926611..ce04e845cef5 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -1112,7 +1112,7 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp) Elf_Brandinfo *brand_info; struct sysentvec *sv; u_long addr, baddr, et_dyn_addr, entry, proghdr; - u_long maxalign, maxsalign, mapsz, maxv, maxv1; + u_long maxalign, maxsalign, mapsz, maxv, maxv1, anon_loc; uint32_t fctl0; int32_t osrel; bool free_interp; @@ -1356,9 +1356,10 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp) maxv1 = maxv / 2 + addr / 2; error = __CONCAT(rnd_, __elfN(base))(map, addr, maxv1, (MAXPAGESIZES > 1 && pagesizes[1] != 0) ? - pagesizes[1] : pagesizes[0], &map->anon_loc); + pagesizes[1] : pagesizes[0], &anon_loc); if (error != 0) goto ret; + map->anon_loc = anon_loc; } else { map->anon_loc = addr; }