From nobody Mon Dec 15 16:12:01 2025 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 4dVQ754nQ4z6Kx8F for ; Mon, 15 Dec 2025 16:12:01 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVQ7541Yqz3gWD for ; Mon, 15 Dec 2025 16:12:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765815121; 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=9do7tBiZdMv7SU6mEhS93PBhHstnG4/abytB871N978=; b=gd5Y4SJQHvucUCQ7LWQs53+FhAAFfQQGMUHbDhi2EnD6DX8rPYswEOSajYTAfx2rL/7VuJ pxxLp4+qCqBRu02MGNfNhRfAgaDA5nJLuKEO3EUp+r3hFYFqkkucNgks4dLvjdTaTpUNXP Oj3B08A/5bZoQYAy6SdvzVsSsuPVQZtA49ecu9ALeiummDTrxFWwAFKbV4ciLSIz5rZr65 xOYR0u3uNLbk1nDt/K3o603rw2OE4/lO7BVd3dtBbWJToGIp4GaOA1AGUWAA0bSguQuJ/4 8dA1K/4BiSGwgpEaDSfnWfhYoOa8CMsHrXl6ul2Dlgaq4W3cyfn6BztSM9vz8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765815121; 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=9do7tBiZdMv7SU6mEhS93PBhHstnG4/abytB871N978=; b=b8/Dp3utN7xbEzjbUfqcvq+Mut/4agRMEoIgSHq+j072Pc9EVZr3OGXZ2eYlRZIQDVrafB 2Sg2HQZ3zYY/AbDOMOro7JyvlSMs4HygKR5jXcduFSiJkfpd+iTvy48OqQOBbIuj+WrVRI uydfXLDeGu/CRMqTct4EfxfrJfx7udDTSEYmEWW4EzUJoSM6Y9t+1KMVk0JGDys74K0p1p DcdjHNMBUROuifujJ+YQtLx6KjKi3iAlfcIRACe4uZtCTij8XFRGDo5I9aqTTB6+lZ+Ggz zHcexZdD8OKrSrREqw+HB7fshOuflJQcxQ5g6mNrlPj7i0zfFwiGMzL7daF8HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765815121; a=rsa-sha256; cv=none; b=Ictw/nXVrhsFJHFUNAuXHQJ7E1eF7u/8nRH4bu9Del0C09kPOBE3hdboXZS0c7yVSPmZGb TJNL46Yhhz/iufq20KajTjLYaUmlAl6jx67mjNBloAlscs7SbpWayEh8pvLVzAzmYUlHPl Z/DK4kxOCVt5aVfyHQoZpJh7MyuGppJKYwedJwjNGyQYnacVnIC+AY1gtMZLXcECnuiZsu YyNprTDWg0QSlHdSNuF0ujyuwL1Tdnsfh+00zSxEBWmhZ3gKBdbCf4BZXqm0TtJ8Smf0h2 +4skDzIj1ER1m1XknZkXhh0B2o96RPY888yJx4Kiz/ElNh79EYVNMiPKh2j2aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dVQ753MrCzB47 for ; Mon, 15 Dec 2025 16:12:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9b86 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 16:12:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8ddb5aff83c2 - stable/13 - netmap: Fix error handling in nm_os_extmem_create() 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 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/13 X-Git-Reftype: branch X-Git-Commit: 8ddb5aff83c275866e505afaea8ebdc87bad7f57 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 16:12:01 +0000 Message-Id: <69403351.9b86.49e9cbd3@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8ddb5aff83c275866e505afaea8ebdc87bad7f57 commit 8ddb5aff83c275866e505afaea8ebdc87bad7f57 Author: Mark Johnston AuthorDate: 2025-10-17 12:55:17 +0000 Commit: Mark Johnston CommitDate: 2025-12-15 16:00:56 +0000 netmap: Fix error handling in nm_os_extmem_create() We bump the object reference count prior to mapping it into the kernel map, at which point the vm_map_entry owns the reference. Then, if vm_map_wire() fails, vm_map_remove() will release the reference, so we should avoid decrementing it in the error path. Reported by: Ilja van Sprundel Reviewed by: vmaffione MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53066 (cherry picked from commit dfc1041c08ba32f24b8050b4d635a0bbbfd9b767) --- sys/dev/netmap/netmap_freebsd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/netmap/netmap_freebsd.c b/sys/dev/netmap/netmap_freebsd.c index db317c6e28ac..8bf4b8c8e460 100644 --- a/sys/dev/netmap/netmap_freebsd.c +++ b/sys/dev/netmap/netmap_freebsd.c @@ -728,6 +728,7 @@ nm_os_extmem_create(unsigned long p, struct nmreq_pools_info *pi, int *perror) out_rem: vm_map_remove(kernel_map, e->kva, e->kva + e->size); + e->obj = NULL; /* reference consumed by vm_map_remove() */ out_rel: vm_object_deallocate(e->obj); e->obj = NULL;