From nobody Sun Dec 19 02:44:33 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 CD14E18E4D8A; Sun, 19 Dec 2021 02:44:34 +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 4JGn9t1Mn1z4qcY; Sun, 19 Dec 2021 02:44:33 +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 BE6231AF31; Sun, 19 Dec 2021 02:44:33 +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 1BJ2iXDO012716; Sun, 19 Dec 2021 02:44:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BJ2iXdH012715; Sun, 19 Dec 2021 02:44:33 GMT (envelope-from git) Date: Sun, 19 Dec 2021 02:44:33 GMT Message-Id: <202112190244.1BJ2iXdH012715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c35b12cc7dfb - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: c35b12cc7dfb3070c418527d9309427ef17f15bc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639881874; 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=l1soCk8tveKrAoJVcIYkzug14kMhrUXjrDFUA+qZc+g=; b=lRlh3kXC5dRL3+VTw2EkWgBp4c+tIFWNZIhKkdBe8VdF5RExdYP9jiBq/rBry8JrX0NH2r zBsLGHSagHzAaDPhJpje9YxcDYKrgb3W5a6oineJ5ZAgSXELxfPhDNIQvQeDvZnAHyJu6z Hzk/aXZGDdRx2YX9af7NT/LL/LfiQ2/PbFF+WOzxTSq4adrgZ9oFrGnFLTQONv9rlmIKio yYWmjuJGfr9yAwDGB87oq1pQSPec/YutKMUvuE5vQpXR0Hyg/qDveQOpbkvmmvLno3Ox+n ccgJJtmAVeJ8g72LK5vBDr4stC6EXeN+9a9K08D9y5QCbtqZhEe/X1fdaMW4gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639881874; a=rsa-sha256; cv=none; b=HQ0bf2L7d+kfe72O1Q7RjRZuQLrHKzy3KZYUvbzhxZM7wxKXAB53SLBWz+NDA5eOFaYroc BP0dAxvUaxZaYuerIrzBaPOdqPvl6IBMziW8f+uDWQeSK3JmH5JCY6m1UrE3lR7xI1GQt4 4qt8DWASqWVm75SwSW3HnLHf1/Xkzuxd3hI4XT+m3WAKuzyO5kYU0rOk6Kr7l4pcD4tk0T DF4lTTSsuivVkI1eamATojsc1LuRDIdsholMADyYlSENpNRQCLtE6s/qXFp+Z8dEfr+mdB ESPu7KzIOCkIQ5C5NkIQZPxCrDR+AbbSEtkh8jpGkpRkZPuoewHt1CRakDS+pA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c35b12cc7dfb3070c418527d9309427ef17f15bc commit c35b12cc7dfb3070c418527d9309427ef17f15bc Author: Konstantin Belousov AuthorDate: 2021-12-12 16:47:26 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-19 02:42:51 +0000 exec_elf: use intermediate u_long variable to correct mismatched type (cherry picked from commit e499988f0cc45ad2e21573b6d11c9cefdd37608d) --- 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 0f42017cb7ef..567c1094bfdc 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -1092,7 +1092,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; @@ -1335,9 +1335,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; }