From nobody Thu Aug 27 13:33:31 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 4hW2XX0XDgz6pyFr for ; Thu, 27 Aug 2026 13:33:32 +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 4hW2XW6765z3bYM for ; Thu, 27 Aug 2026 13:33:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787837611; 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=CKyFsZlPmkj0nMznSjJjNAfgD8WvE/ImI1eN+h4a/ZM=; b=HoVQYqXB1pmHB/yfnHkP5kogeaBo+GkqTC8WPBFJzSKOw4R4hW5iX94GJy95LlZxmYaT9u WeAVrzlhAv4UwZE6VxXr4ulCUYEv0nE6txwOFGoqoCIrQuUUUvmeYHFjuxefhTdQbmuCUT vvYTA9Ut8eLpqG3Z5fOk8wbmc/dD1NNiMHy/u5zmQv7rW3ZiPD/a1WK0ybx2IV60lyvwzS 0gbQ/9ch8ZfvGA0IaPdeiW6PJbNNaqhGFdoxF3efP2NJX0jxnvUlVz09MMxLXOMVzKKZYq z/BbCyVWuCPoUEZtumj4s+QxQtPVHrj+mFK04H7v/ZOsbx3KxoXqM3Tigi2F3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787837611; a=rsa-sha256; cv=none; b=Gh44n7MUZwZTSPnkUvjR12tSclFeo/8BFxQfJkAad5G9biCA1tKFeF8aGIO+jrLH691TmW gCaACnQsPiYboyE1nYSNx+KXTp917h5hqoXZ4Ct0fubJCXIJWsZgX2Xj1GIcVhu+e31m8p I2PJXA/GhN6x+QbEt4nWEUnA9jX5WvgHzVlDSEsJ0+mafMhYFaAUZ6jdfF0y+0muYHEM4Z 83wZXaw3QhRSWAsfyo+LECmzDygMNg2tITR/y8D+X8mCJhU3khKR5ghLgo7PFzD8wZxG0S mlpZ0Pf1EicGhkdEUXJR7ye47Vw/Aqa0GBrFzrpoDJptaZHNiGfL1TDxDo/Deg== 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=1787837611; 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=CKyFsZlPmkj0nMznSjJjNAfgD8WvE/ImI1eN+h4a/ZM=; b=pEZ5WHbh1FmdTj8D+js9la5G1XlrA5BGSab6ArmMcZ4al5qMRV0OoUiOQI/xHqpwK/43Cy XHOJQEuLBcubQaWFt1N/Rm2zNMy7bV4Gh1Egm6INCRjZnn9YiNvvewScemwIDCiSUQefJ2 fLBR9mc1OckKmAjK0n//IaBTgE1PgjG7x/S0Mqwtqe3pRIYwSggoPOC12PS7Wewhh8lQbX X7hAQX+3AejEd8GWFPI0Za0zN5tcJyQoGE2Cl5UD0vWlcLX75fFrfoA2Y1ofFtGjHOZ55S RDV5/K6+k5HspTSpHNNHniLGCUnCb9dxEroyNZsqDOP+IQV72uwfDWEmvfQhhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hW2XW4rwDz9DL for ; Thu, 27 Aug 2026 13:33:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24995 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 27 Aug 2026 13:33:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d6f5c6531e48 - main - netmap: Use ckdint.h helpers to check for 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: d6f5c6531e4848086478961d03f4d13170eff02a Auto-Submitted: auto-generated Date: Thu, 27 Aug 2026 13:33:31 +0000 Message-Id: <6a903cab.24995.1934db6@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d6f5c6531e4848086478961d03f4d13170eff02a commit d6f5c6531e4848086478961d03f4d13170eff02a Author: Mark Johnston AuthorDate: 2026-08-27 13:06:20 +0000 Commit: Mark Johnston CommitDate: 2026-08-27 13:33:10 +0000 netmap: Use ckdint.h helpers to check for overflow This addresses a bug in the addition overflow check added in commit 319414a926af ("netmap: Handle overflow when computing ring sizes"): that overflow wasn't actually caught by the check because "len" is promoted to size_t. PR: 297300 Fixes: 319414a926af ("netmap: Handle overflow when computing ring sizes") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58896 --- sys/dev/netmap/netmap_mem2.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sys/dev/netmap/netmap_mem2.c b/sys/dev/netmap/netmap_mem2.c index 2d77acbbb06c..21a7c0900fcf 100644 --- a/sys/dev/netmap/netmap_mem2.c +++ b/sys/dev/netmap/netmap_mem2.c @@ -38,6 +38,7 @@ #ifdef __FreeBSD__ #include +#include #include #include #include @@ -2013,16 +2014,11 @@ netmap_mem2_rings_create(struct netmap_mem_d *nmd, struct netmap_adapter *na) if (netmap_debug & NM_DEBUG_MEM) nm_prinf("creating %s", kring->name); ndesc = kring->nkr_num_slots; - if (ndesc >= UINT_MAX / sizeof(struct netmap_slot)) { + if (ckd_mul(&len, ndesc, sizeof(struct netmap_slot)) || + ckd_add(&len, len, sizeof(struct netmap_ring))) { error = EINVAL; goto cleanup; } - len = ndesc * sizeof(struct netmap_slot); - if (len + sizeof(struct netmap_ring) < len) { - error = EINVAL; - goto cleanup; - } - len += sizeof(struct netmap_ring); ring = netmap_ring_malloc(nmd, len); if (ring == NULL) { nm_prerr("Cannot allocate %s_ring", nm_txrx2str(t));