From nobody Sat Sep 09 11:40:59 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 4RjWJW3rMLz4tPJH; Sat, 9 Sep 2023 11:40:59 +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 4RjWJW39W0z4Lwn; Sat, 9 Sep 2023 11:40:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694259659; 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=ifCgl8wRDJRQAcQ1aG5GbiWHmg42+RQQP/j9yq4UMvc=; b=lJnaAz817k7HbJ/X3Try0LPd5E5a+fwEg7kG79BsdLOfBXHkfdB6y1aE0j2PFIOG83kXGa UkdxdW07cEUyNaGFYE6zT0PBXsjwhEx4PrPbV0vilYuOZkhExbcu3wk5PMlTv2lAV8bAWL W+ET6S9UeGKOhTSfsBYd2BG5p2IJqLoGf/DRTfzdh1TpaZukZkdapQuu2t0g/dClHroPzx HsxvN8rCLIFS+s5aYmkAHrPw0C4bBYebWCEucMEYd1VP0m+woyNpCa0HXTyVOh01/envVb x1qWx1EClWAl5WuxbBTDEoG+W3EVdkTEWeW8MdTCFWyuoxINV3Z+telD5GbbXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694259659; a=rsa-sha256; cv=none; b=AcIRSYrMkjnZIq5SiP45hRJiCiZpvXq9BkdFIbDxpzjUGAWpO5BKmkfp2aU2CRqV2haMNF vl0G7eOyNEs2QNo9aRFPBztrbsRQ6FKQa0N7awT6pjc/I3ki0wDhvSyGIVgUSFjWlLai3Y lifeY25/sg0bNigqdf6twrBdCNsOWSc3+HTh77L0JchQMuIefnVZcVUq7Is6fzRrzbGlM/ pC59m8oOtva1LfhZF0tFYbJE7L44HAcWf4nPzHg054FMFJ2MXipYSoKgiyCKCwqCXC/XeT y9qDobG/VBjtxF1DgbjJu9a8mZwlC3mPIvL2ghXkpncCSqGyJaDJqMqaLvMDGw== 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=1694259659; 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=ifCgl8wRDJRQAcQ1aG5GbiWHmg42+RQQP/j9yq4UMvc=; b=SuPXL0dXPzv/6nH2+EsNg8iQ3/ZK/wox1+1FEYecZ/iF0ldAY/Bi+Rtu1TprOnHnITrfTb vvZ2Uy42gik6tms4J5wLAuCF9KbOfwiTgm/LwdA1BE7nR9aXb9qtR6OZ8ZMyWNnW7/6c3r Zqymzpnzfs8LlVHe/Sx//EFRQHOdsIqSczjctaGGfQc7Fbpp00NLmyw4v3pydZdudj3Iux RBQPSRRUTYcjxIUTY58YBqxoUDJAgGooPS3wXtD2NCVzp4+u+70flkzzP6s6dHi4pFY6sy DWbGvpdMJEDY+4GrIBMC/FB8eWwPNx9QTniWzmTn5GwY6aORAlBqZv0SrpjhWg== 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 4RjWJW2GVVz7rQ; Sat, 9 Sep 2023 11:40:59 +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 389Bexg3077020; Sat, 9 Sep 2023 11:40:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389Bexhk077017; Sat, 9 Sep 2023 11:40:59 GMT (envelope-from git) Date: Sat, 9 Sep 2023 11:40:59 GMT Message-Id: <202309091140.389Bexhk077017@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: 17922d7028d9 - releng/14.0 - __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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 17922d7028d9ba4e6ea68243a79bee3008abbe1e Auto-Submitted: auto-generated The branch releng/14.0 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=17922d7028d9ba4e6ea68243a79bee3008abbe1e commit 17922d7028d9ba4e6ea68243a79bee3008abbe1e Author: Konstantin Belousov AuthorDate: 2023-09-06 13:50:27 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-09 11:40:24 +0000 __crt_aligned_alloc_offset(): fix ov_index for backing allocation address Approved by: re (gjb) (cherry picked from commit 03a7c36ddbc0ddb1063d2c8a37c64d83e1519c55) (cherry picked from commit cbf1bbe5c8b5afedff247dbc20f4bccd888a06e9) --- 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); }