From nobody Wed Sep 02 22:40:47 2026 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 4hZyPD2sRHz6qpb4 for ; Wed, 02 Sep 2026 22:40:48 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hZyPC6mx9z41jN for ; Wed, 02 Sep 2026 22:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788388848; 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=QbM0qXNjGj1WCIC7l6tn+UGhJbjKz9feKzaIm1Bmf7o=; b=ddkTi4ydrlTqKGRhXIUGL6CYf6iylrubhzUilfYkMSIQTnPJLkfPJtFgUFcG9QRzOXcA3W P6XZ6dtXzE6vy99sevIUi0Ze6casr1ehnlNQCq38Gncb+8UKTBTFLjInqJn/IjJhphE0dO QzNOspGZZ4P2g6N8/gE8FjA9/zl/lkNoBZzs+Dd0DX7j9J3GxeXUFEttN0QnRseGjKh1qg /51JlMZ4c/tskJePvf+6JVZKO/d0kUKVQDB7iVOoazLCVrRieX0dXM/QVExcFGniHOrZdk rk9Ldr3yJ5yYOxP7GLz1SggvDya4kyrC2UPO54oXigRVcPncOkXTZo2bLWxquA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788388848; a=rsa-sha256; cv=none; b=CrKrRNTWUhthFIHXfP86iNsVDjste/w8A7xwz9PhDNIciYzy2C3WtnIo1QDsPRrcNaR3O+ sk8k9rPfkf4YLmGDsNz9fIzm3WN67WlPXcqCz9qJnTqC7JNV4Sc7+MFzQrDNY+c1Wpyfdl spQS5K1HdEbfa33S+GvXgG+EBL0tloe+VTg6twnC2aVvnim/w1q0s/13tEN3K6SGqvy/9p tzFxHf1CN3wy4OOyG3cIUzo7jHR/KcFb5krQKONI9OlKBMOzYI2pK61XASEytmz5P8QMlf Xu/GmNhldc82dYOpbpgKql3+mrq+oZjgC4acgszqcinqO+P9xZpesOrSEDzKwQ== 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=1788388848; 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=QbM0qXNjGj1WCIC7l6tn+UGhJbjKz9feKzaIm1Bmf7o=; b=X9AoI6kvgwGHZxyr07swd36Ve4q1gPbK1gFHSjM9pELFvVGC3Fe2+OYY1rP1Xr1WAZCdN6 8ICbgqWDysZorBEsTv5P3CvjPrfpMyoOD08Od7JD6wrTOcvTSrmrzjaiggtOHh3b2gN3ZH w9FqW0PbjS5PqJUUMU2NQcx1Rmf7iq6IMnrR5BNsOx8GCHruCk87/L5uyEXzhOOqmyTcdw LQbfXI+1Y7jPnG/diiboOfrygLoC6bBJkKmGqRBz7yRS3tOUIaoVyfRhZcR66LWKt8vLjQ LJG/d7Hf7tS6p7ZS0jRgY8jI4KWI4dBQf+2KYQZe8vl4XodixzkSQnwIGKttsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hZyPC5VBSz139M for ; Wed, 02 Sep 2026 22:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ea77 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 02 Sep 2026 22:40:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d489039602a4 - stable/15 - malloc: Use ckdint.h helpers instead of WOULD_OVERFLOW 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d489039602a4b1730cfa018c0e982d20e1f496bb Auto-Submitted: auto-generated Date: Wed, 02 Sep 2026 22:40:47 +0000 Message-Id: <6a98a5ef.3ea77.7a4f35da@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d489039602a4b1730cfa018c0e982d20e1f496bb commit d489039602a4b1730cfa018c0e982d20e1f496bb Author: Mark Johnston AuthorDate: 2026-08-17 18:15:17 +0000 Commit: Mark Johnston CommitDate: 2026-09-02 17:40:28 +0000 malloc: Use ckdint.h helpers instead of WOULD_OVERFLOW This serves to demonstrate some usage of the ckdint.h helpers. The new version also generates better machine code on amd64 and arm64. Reviewed by: kib, emaste MFC after: 2 weeks Sponsored by: The FreeBSD Foundation (cherry picked from commit 2d67765f10e7da43ba2d4a7fc074c15d5354684b) --- sys/kern/kern_malloc.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index b0bb4511cb16..ffc260781d60 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -43,13 +43,13 @@ * description. */ -#include #include "opt_ddb.h" #include "opt_vm.h" #include #include #include +#include #include #include #include @@ -823,22 +823,24 @@ malloc_domainset_aligned(size_t size, size_t align, void * mallocarray(size_t nmemb, size_t size, struct malloc_type *type, int flags) { + size_t n; - if (WOULD_OVERFLOW(nmemb, size)) + if (ckd_mul(&n, nmemb, size) != 0) panic("mallocarray: %zu * %zu overflowed", nmemb, size); - return (malloc(size * nmemb, type, flags)); + return (malloc(n, type, flags)); } void * mallocarray_domainset(size_t nmemb, size_t size, struct malloc_type *type, struct domainset *ds, int flags) { + size_t n; - if (WOULD_OVERFLOW(nmemb, size)) + if (ckd_mul(&n, nmemb, size) != 0) panic("mallocarray_domainset: %zu * %zu overflowed", nmemb, size); - return (malloc_domainset(size * nmemb, type, ds, flags)); + return (malloc_domainset(n, type, ds, flags)); } #if defined(INVARIANTS) && !defined(KASAN)