From nobody Sat Sep 9 08:27:03 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 4RjR0l6C1bz4sNv4; Sat, 9 Sep 2023 08:27:03 +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 4RjR0l5XtHz4M7b; Sat, 9 Sep 2023 08:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694248023; 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=WO4CnjVVD5WaXH7zpMAtelG1fA8WyaFEVgqmoWgcGQ0=; b=tGMvS9sjHoE8RNT4fulD8bV66S9BajRfj2bJ1mLDqh/PqvYpdUuYksWyjEwCEn3CCJAdou p0jCs5xTDeGYVwO4HC+p5jm9jM76KJDVFpVvvdgexUQfd8cxMXlGtS1vlPHl+Hr1u8ZyJv 68JQkX2t53eXHsAMjoc5hOGNBUyAyZJTMyiZJB2pIgtVgU7/WK7R4vARVtQfiYtD7ibGmD SzOnwgXpEPjy5BZnUNXO4CeWIUaelrFiMVtGrgW7R0HcQBGsv0sbttJum6M5VO/JkLop4O FmYKio+EnldUPtMOSBblGcj/7WOudOmAUAC0qpfqN6Hs+MuYHyHgOC8sOozqwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694248023; a=rsa-sha256; cv=none; b=Uc4Fz62GL/yViE2/DlD3LNT/g2xt8GUhftDpWMS33SYo7M0VtdXf2pHHAyaR6r5IzkYefU g+WstGE6Z1fWJSXhUM2/LP/nrY8qyXR43HRDbuSbUR4k5mageD8YrlpUX6gMsfB1vEHQ/I qOUwAX4RuP1e4VKV0a6eLx1697prgFsEFsazCe/oiMQCefKjqcyoJWQkw5qNmzyG4UMZBW 4s7rXdNu48pL/FpPnxeyhFtD+rwH9BQuaO588Av8forD/QlrcrhIL3uojD/79zzvYNQAiC M3NQe0CgoqKne9IzYQn09XttRYenJGz8v9c1AGqJ5tCi+VJZMLwQu/y3bIvN1w== 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=1694248023; 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=WO4CnjVVD5WaXH7zpMAtelG1fA8WyaFEVgqmoWgcGQ0=; b=u04ZY7RjbEPhnJPBEVBfQrpHUO/Ld4v9vg7WbJXvIOG8tDL0eZt4HUxigp2k0OiJf4TKbB ZazJ9pAq9KgFT6UcMk+vzEs0AMcSXzlCljj/8AzED9TY7T7TYfKhzYvPGvWjJKc9O4V2rG eoeUzw8i82SHWhFvFiBVvloEzL8MFDs5SZ2xnuzP7icvWK5S1AoA3takoxypGLbqMlnCjx H4OfTMjhbv/czMG+pGaKNRTO/snYkn2ROcL8Xc2Qo603XsLv00S/FxFjJa9HXyTKBUiK4Z nwj5H97qHFkeMlnF2b3NZwxR1VXLUVQLCvPGOkRc5yKIzVbA3BF5pMvwM6wK3Q== 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 4RjR0l4KQzz31B; Sat, 9 Sep 2023 08:27:03 +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 3898R3f8053766; Sat, 9 Sep 2023 08:27:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3898R3qQ053763; Sat, 9 Sep 2023 08:27:03 GMT (envelope-from git) Date: Sat, 9 Sep 2023 08:27:03 GMT Message-Id: <202309090827.3898R3qQ053763@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: cbf1bbe5c8b5 - stable/14 - __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/14 X-Git-Reftype: branch X-Git-Commit: cbf1bbe5c8b5afedff247dbc20f4bccd888a06e9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cbf1bbe5c8b5afedff247dbc20f4bccd888a06e9 commit cbf1bbe5c8b5afedff247dbc20f4bccd888a06e9 Author: Konstantin Belousov AuthorDate: 2023-09-06 13:50:27 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-09 08:26:33 +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); }