From nobody Wed Aug 2 00:37:17 2023 X-Original-To: dev-commits-src-branches@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 4RFtNJ2Wqwz4q2kH; Wed, 2 Aug 2023 00:37:17 +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 4RFtNF4wjdz3pcf; Wed, 2 Aug 2023 00:37:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690936637; 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=BpbXQvpebPedfNjyGxTca0ewI7WxlehpvZkP8+DuAig=; b=iwpkKwDRHxBXH9Pv/HlMyi/Yz6UDX1nRr6k5K0xUzDMgscnYgyrUfVilhhJARq1Ah02vF/ Kbjd77ZkRQf8GAyQ5eBbuGWQt+jCu4/FiLi4w/oCjwjp8FsPjlANfUXAySof+IDClWx2Qv dCoePXJL5AKyT/clytmR4KfiH3VTyCFrnXQXhYO8BNRyAu1x2n6qbONj3rCZIeeb1C2wmF cuJaQRlnkfeEBd+fLMJu6Hrn4Z86lggYMYU0tgtGdqNNBWt0wNJnoojD5HTao6WxaHVLGx P4Y3AnqhHJ+fuCP9mDWK3cxmhKssGcZ+UqNhgP+Fxc0un0tqSbXzEIuB9MBm2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690936637; a=rsa-sha256; cv=none; b=VBfAbq4eVeOpLYoQQeTfazVyuxYQU3NWYLXrSrPcw7Mtz6uBJh/t3vjCx+ELG9phg6QxIJ hHHgikutS9YT253tkUhpt94QffXoayGdo+nNIWSGFDPINh/v8NAoYZiU24FYoBKaWdXXx+ hLsS75smg5VOIJpqstv9dupbTlGJqjIWHqNABkT8/6XxRcbJCd1cn8vDhQJMvXQbZ2RpJu 19Lx8magjam1ON6Hb/kSCfYoyLnQJc1LbLjzfithQplUWUYkqOXZtTbPBePsf7V/cH/KG7 VwusVmO7LESCrEoCY51fsoiKLqfEcBr2Z0X07KsHVlkP0IWwC1pvyBYeOBoXFg== 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=1690936637; 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=BpbXQvpebPedfNjyGxTca0ewI7WxlehpvZkP8+DuAig=; b=tx3p6EI6GYX72RWE4xcl8tpTHKfKlI56cSCHz+uYwhLRfBa8M4jmbpGRkMT8by+HZQt3te ezr9KKVpC38NHdsHmvht0Xnh5W+tFAyWCSlLPxpltFV6Q4rxaNWy6/s0FX+l6TKD6YWWrn FDdJpV5Hcm+XyemADLDO2BDVwGoDJsrqX8h0a1n7X7mYDP1c1+9x1NS3kxS5qydYIvK1G9 EQbcdVfkQh8oPdMZmo/fYxLydQqy3iIC+xInwDJIUN/thhbWIDXXhTdXBY/Fah/i06O50P F2OfSDf+LBezOqIJiHn3cDxs+2+TFBWP50PE4iq7mbz0TEGq6WRzBcwp2g1JWg== 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 4RFtNF3cwNzydp; Wed, 2 Aug 2023 00:37:17 +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 3720bHej060619; Wed, 2 Aug 2023 00:37:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3720bHJ2060618; Wed, 2 Aug 2023 00:37:17 GMT (envelope-from git) Date: Wed, 2 Aug 2023 00:37:17 GMT Message-Id: <202308020037.3720bHJ2060618@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: 4c22848d1a7e - stable/13 - rtld_malloc: add cp2op() helper List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 4c22848d1a7e3fc996adc0cb71e35d7be8b26ffb Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4c22848d1a7e3fc996adc0cb71e35d7be8b26ffb commit 4c22848d1a7e3fc996adc0cb71e35d7be8b26ffb Author: Konstantin Belousov AuthorDate: 2023-07-22 04:24:03 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-02 00:36:40 +0000 rtld_malloc: add cp2op() helper (cherry picked from commit 86c7368f2bcefeb257f7dc40e4296261b295a674) --- libexec/rtld-elf/rtld_malloc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 45d3f743e348..3437f638d339 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -106,6 +106,12 @@ static int pagesz; /* page size */ * increasing order. */ +static union overhead * +cp2op(void *cp) +{ + return ((union overhead *)((caddr_t)cp - sizeof(union overhead))); +} + void * __crt_malloc(size_t nbytes) { @@ -209,7 +215,7 @@ __crt_free(void *cp) if (cp == NULL) return; - op = (union overhead *)((caddr_t)cp - sizeof (union overhead)); + op = cp2op(cp); if (op->ov_magic != MAGIC) return; /* sanity */ size = op->ov_index; @@ -227,7 +233,7 @@ __crt_realloc(void *cp, size_t nbytes) if (cp == NULL) return (__crt_malloc(nbytes)); - op = (union overhead *)((caddr_t)cp - sizeof (union overhead)); + op = cp2op(cp); if (op->ov_magic != MAGIC) return (NULL); /* Double-free or bad argument */ i = op->ov_index;