From nobody Mon Aug 17 18:42:19 2026 X-Original-To: dev-commits-src-main@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 4hP1sS3wnbz6pBGB for ; Mon, 17 Aug 2026 18:42:20 +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 4hP1sS12JMz3M65 for ; Mon, 17 Aug 2026 18:42:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786992140; 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=2CQFlrW4ckoKwuCVxD26r9jVMZSN4q761NakbDES5gQ=; b=b8IA3qZLjSq3yWIjwJLOGlFWuyDKnZa0JUxr4D8ppaljwPg0lLuflmpgT+AoeLxQlNZ3m6 RwX9zjFLKaiX/qG0FMSgnNwFghCTv21Ug1BAlGkqvShakSuyKbGbKwyjCsdU0igz9OYvVq vJC9L6FCLGsM0vbSUfgWHP+uxLJ1H+0ik4DUFFiEaNWnfrbAmVPtCwmKakxKy6sdNTzL9C GB48JfL63zCXw7CwgJdHp7XiFJjmP44i2UUkjvt3Kkq94Uog6oc7w5TaptzrWmDdC1IjNp Af221IW52V02OegdnGMApgQ02y/bytid67gWRxr8IMIyXr7pi81QMvWJ4pjYsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786992140; a=rsa-sha256; cv=none; b=XrdlLGAtgAA0kTeq37YXR1KZahygeUhZ9IlmQ0+hR9EI/lwrqqmtE6/4GmI/MfCB7MYjtV hZKeNSiDu3sT/CvW9XXrkh/55pGwfQgHP5ynDZBpotiuW4dLjBr028H6mQl5LH2Mh+SFK6 SQnyQG7FODVJqK1IKZeJ1RpX7OiOb5L6PCr4vcpnxoiVju5vT1CKyyn2kQjsSAJ6fHi+YR yp0HnizOStw68d3MPxRaNhzBJjb7wvewFqYAsV5nXZ5GN9/kxwTyk7cy+CY5/aNkx5sUwi 8KLuTKvjMBwnV2Go21xem6ZT1L0Gb7EnXB4M6d096GFiVBFNXLevaXJmiqJb2g== 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=1786992140; 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=2CQFlrW4ckoKwuCVxD26r9jVMZSN4q761NakbDES5gQ=; b=ob6Yfrla5Gt4qR1+5GOu3UILAGMnXFfaSocqiILuH8SDGyoantOxF+mwViKyj0Zqx/YqbO 2b7hEuIeknQPPwYtHJa7eS9Htid1huU5C2fa7rzyfwOqUMnt7r45TVi+WkcjHgXMZiHZ7n 9VWZ7FLCcnmMWS5y7RhmdnTwJKK9ssR/aqofd1XRcI24y5I7knieqi/NhovHt4KEbKBPeX 58bXQ2cKszY8s66Lfx9asaoFGvIN+51plpgWHo/cmphDqJu/9R7HXcQ+SQs+U71nndZy0/ 29G53Gknn3LbtMGc5XDe0DO48vCB30iZ+m/YS9hRYsOnugellrdHCGCgRzGObw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hP1sR748nz1PgR for ; Mon, 17 Aug 2026 18:42:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c43e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 17 Aug 2026 18:42:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2d67765f10e7 - main - malloc: Use ckdint.h helpers instead of WOULD_OVERFLOW List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2d67765f10e7da43ba2d4a7fc074c15d5354684b Auto-Submitted: auto-generated Date: Mon, 17 Aug 2026 18:42:19 +0000 Message-Id: <6a83560b.3c43e.46e5fbcb@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2d67765f10e7da43ba2d4a7fc074c15d5354684b commit 2d67765f10e7da43ba2d4a7fc074c15d5354684b Author: Mark Johnston AuthorDate: 2026-08-17 18:15:17 +0000 Commit: Mark Johnston CommitDate: 2026-08-17 18:41:36 +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 --- 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)