From nobody Fri Aug 7 16:30:37 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 4hGqQ628bYz6nMBQ for ; Fri, 07 Aug 2026 16:30:38 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGqQ60rJHz41hH for ; Fri, 07 Aug 2026 16:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786120238; 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=zt4ebK6AR3UPcWxpnpn7aXQK/x13xCz2Aqzehldeiz4=; b=JogBXbY4Bh2AsRrHTxESclifh4OCkRbxEz4ehyf/+1xOuTBPayyUA4m1ZtB6L//ssYdaMQ AWPG9IPGCOM7ruw3p0bxM00D1890+b9Ccvg7d3XvBTT++D6p+A33fYKtffVHM5OSBOmY32 EVSg1awF4bsmB0Q5NbRvmnEmjXAkrsm5oMcYxM8EtDgPNqpn6Z5PaGmUOo679QDgFkiHMD bp7nnGj9YwO/Kdwjt7McaLPymPDA5eqBzcx8NcN/FWy7k9I+uh4e+ip5sNxq0rlyLdcybj O29+m78Ta1lmWhZe2i/ARSCLGCZ8naBnNMgagKuyty1niDHfMvm8aQJqNdKxZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786120238; a=rsa-sha256; cv=none; b=IqoX101NrVopTstDa4lpRKSjIVXLf6R/qpeuf6im565Wv+PAnsd9AbzQl1oAuhRs9fBgiN xCLHvpktyH6SAAF+ldVofJh9r4Nm4v4sNSpRmtqeuhX/xxz/7/b0rW/t6ZuKAW8ijCPNUG WTv/r7jhyYSJkz/uAi0rDHiORD3rcQt4bUGBJRqOwmFtBy8W3QPf0ptocczvwgVR9bWxCk Ryy1auL1ponS3+vp+286eFw5nlLDPYCAkSDybYYtExBo/ocrtN88Uh0MwVUXnyZih8+fn4 Y8QXF3zwfNe5C/FXoQtjpHkMsZHfG5M+8I6nfBdTxEDCmbno16UJufVqw9DOyg== 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=1786120238; 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=zt4ebK6AR3UPcWxpnpn7aXQK/x13xCz2Aqzehldeiz4=; b=nQLv0+vK9C/74uV70FoDVM9bGCzmWfajMCGGqc88KqTrwA4kf0MNqAHW3KJC3aZ+vqJmj/ 4QAaVmaMF1FCEj2quY6U9tKst88e3WEt9BTDBkIBwQcPCHAH4FxGp9++u4svWuHYMcMw3c Rh7/6pn8BhVWrdsRavX4kfWvhhPnLBID2uXOWd4zmEVKs6AWTYrPCXRxrQ3PSnLjMZfEGP qZO7Q1apsgYlkOYQsXb0ijj//03Jb/tM4h7XbkAz/3nLl9U84ui4x4RBeNoaoB/SSfW5IO bjxOj3OtZqFki9L2gXuJJ9TT+oj5EBnfDubGHxIZGxT/w7ZS8PCKR2s9yPb0ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGqQ56ZVNz1Dry for ; Fri, 07 Aug 2026 16:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23c35 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 07 Aug 2026 16:30:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 319414a926af - main - netmap: Handle overflow when computing ring sizes 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/main X-Git-Reftype: branch X-Git-Commit: 319414a926af1515e2572f89f0636e5505e762d5 Auto-Submitted: auto-generated Date: Fri, 07 Aug 2026 16:30:37 +0000 Message-Id: <6a76082d.23c35.77f6b59@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=319414a926af1515e2572f89f0636e5505e762d5 commit 319414a926af1515e2572f89f0636e5505e762d5 Author: Mark Johnston AuthorDate: 2026-08-07 14:47:13 +0000 Commit: Mark Johnston CommitDate: 2026-08-07 16:30:24 +0000 netmap: Handle overflow when computing ring sizes PR: 297300 Reported by: Robert Morris Reported by: syzkaller Reviewed by: vmaffione MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58678 --- sys/dev/netmap/netmap_mem2.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/sys/dev/netmap/netmap_mem2.c b/sys/dev/netmap/netmap_mem2.c index 865a663da364..2d77acbbb06c 100644 --- a/sys/dev/netmap/netmap_mem2.c +++ b/sys/dev/netmap/netmap_mem2.c @@ -39,6 +39,7 @@ #ifdef __FreeBSD__ #include #include +#include #include #include /* MALLOC_DEFINE */ #include @@ -1992,6 +1993,7 @@ static int netmap_mem2_rings_create(struct netmap_mem_d *nmd, struct netmap_adapter *na) { enum txrx t; + int error; for_rx_tx(t) { u_int i; @@ -2011,11 +2013,20 @@ 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; - len = sizeof(struct netmap_ring) + - ndesc * sizeof(struct netmap_slot); + if (ndesc >= UINT_MAX / sizeof(struct netmap_slot)) { + 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)); + error = ENOMEM; goto cleanup; } nm_prdis("txring at %p", ring); @@ -2040,7 +2051,10 @@ netmap_mem2_rings_create(struct netmap_mem_d *nmd, struct netmap_adapter *na) if (netmap_debug & NM_DEBUG_MEM) nm_prinf("allocating buffers for %s", kring->name); if (netmap_new_bufs(nmd, ring->slot, ndesc)) { - nm_prerr("Cannot allocate buffers for %s_ring", nm_txrx2str(t)); + nm_prerr( + "Cannot allocate buffers for %s_ring", + nm_txrx2str(t)); + error = ENOMEM; goto cleanup; } } else { @@ -2064,7 +2078,7 @@ cleanup: * to do the cleanup */ - return ENOMEM; + return error; } static void