From nobody Sat Sep 09 08:28:00 2023 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 4RjR1s4K34z4sPhl; Sat, 9 Sep 2023 08:28:01 +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 4RjR1s0bnHz4NMD; Sat, 9 Sep 2023 08:28:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694248081; 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=o/gIOis+X9h38LwEeNfQaEo/qIDJXTL8StCEHWGaY5c=; b=hcSBt3u5zdDVgipBBigE+e5QQvuZq7F2xRIWSffTXNqujDURL0Aq40IaA+EjdhrNHCagjp Am4l6ib/BHFDC8V5txOjXR8GT/wRrO8vi2bskaaAAnU1K7t0Sc0WHW0zVXBjvA7/qbNYSC 12dgj8pFAJTh904Et7NkSkc9r999MF0H6+HOSdRulgvEm1+OVfszZoG+PqrFV6rdeP+a92 HNNXeMPO+g15T206S/G+OmbkNh5J+IiVMPntQBaRtuTDmJnAhCMj30RaDFKwtTvzo25cS9 Y9PVtXZ7TzVgRr34Lw5CDknzbktnyE5TpogXSU++ZD1cBDGkZTjywH3g2TskOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694248081; a=rsa-sha256; cv=none; b=QrzzFwlQ2EoK5SJP28waKq1tWRtbnDCXmnOaMqXyc9AyrCVJfGdVJv8S/zwy8hji5ENyZZ iMxeQ5Mc/F6s2kCVmM8HLiZ0wXKUyiRQbCWJNuJEYOU5q9S+TZ0RDUmVMb7I3+p57yDbAa Rh+5vG31VPGUNsRorZD17/fsV1aEqO0qieP7b+x7ae+0CP2vBTeFd52kvu7B/Ja3Mp/rLT aUJqv123L9hu520yac4G1ws2g23t+zf8oDtXDWfuYygKyHqmwasz3JrhDoHtrXrp5MtQci eD3SH9vSBsdA1O6I7o3B+5Ndoi+EMw+BqZRWNNSSBMKNYkcgO7OFDULKG5vgqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694248081; 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=o/gIOis+X9h38LwEeNfQaEo/qIDJXTL8StCEHWGaY5c=; b=d91QG0AXKRGh4UeNG6yHo7Oh8MFheSkMaqvI8Wg/EZtBBvHhLEOH60aRcWjR7CmntNBtA6 VVrlNr44Z+IBSf8QUgBW1+KVZKv7fIY8j8osls7pUeJNs6CIhrUbhN5yx2OX0IkCzVt9nY A5k5plXOs8Eckfb/7U/llOVDMvkHa340+/nz62q0rWYVLPNt9E/kLmHtyk5wJR0U7OmOkR lYOWtUH1LLys9Zgqx1GQPVEqfwyTJvpylFC4te1Oh51yR+MjKYG0eUUzATBs3wlsyDNWzs lv55s6gdpBJ8FUfGg599YoHqw25GTUNdKyC4j1u6PS7tl7xU6HEJ4ZLk2gFPbg== 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 4RjR1r5gBxz2vk; Sat, 9 Sep 2023 08:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3898S0XM054174; Sat, 9 Sep 2023 08:28:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3898S0jJ054171; Sat, 9 Sep 2023 08:28:00 GMT (envelope-from git) Date: Sat, 9 Sep 2023 08:28:00 GMT Message-Id: <202309090828.3898S0jJ054171@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: 875f06276b8d - stable/13 - __crt_aligned_alloc_offset(): fix ov_index for backing allocation address 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: 875f06276b8d5e1b7bc435b0436c9f203c492e36 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=875f06276b8d5e1b7bc435b0436c9f203c492e36 commit 875f06276b8d5e1b7bc435b0436c9f203c492e36 Author: Konstantin Belousov AuthorDate: 2023-09-06 13:50:27 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-09 08:27:32 +0000 __crt_aligned_alloc_offset(): fix ov_index for backing allocation address (cherry picked from commit 03a7c36ddbc0ddb1063d2c8a37c64d83e1519c55) --- libexec/rtld-elf/rtld_malloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 6e011e88ba5a..4b5140551675 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -188,7 +188,7 @@ __crt_aligned_alloc_offset(size_t align, size_t size, size_t offset) x += offset; ov = cp2op((void *)x); ov1.ov_magic = AMAGIC; - ov1.ov_index = x - (uintptr_t)mem - sizeof(union overhead); + ov1.ov_index = x - (uintptr_t)mem + sizeof(union overhead); memcpy(ov, &ov1, sizeof(ov1)); return ((void *)x); }