From nobody Mon Dec 15 16:11:51 2025 X-Original-To: dev-commits-src-branches@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 4dVQ6w1JXkz6KxMf for ; Mon, 15 Dec 2025 16:11:52 +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 4dVQ6w0V0pz3g33 for ; Mon, 15 Dec 2025 16:11:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765815112; 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=G0rwWfmd+EEvCFCIeSsIoZ2f4ZvN+75ykyzhVb6fb6w=; b=JpUHuwkanwb1X4HIWASpVSifznK0XTWlTRxcJaNByEJKMd31RgDSTOJR78JnQGy8kU7nG1 tVcSprmim4OGhYNy6iJZGhkZRc5M9cMlkPPEMHhNoAT4kcPHn9BpDcEAurRLiyE2gWKvQ8 q9tigjG4LavjDrzzV7EaYebW5iGzooqUKXAYDAiJ9+P0HS7RLm4/vzFix4spEPlOs/bODr UsKOowxXIUhhpgHCPNZ21V8i7UDIrmJHIWHI7I2TqECreYelRNjwpeW5kzSPm15liu458R y45I3DS++QZV2fd9ZcrexCgSCj7ZAqGcMt5ABo1B+PU29KYYpmIw+iStNLfpZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765815112; 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=G0rwWfmd+EEvCFCIeSsIoZ2f4ZvN+75ykyzhVb6fb6w=; b=cXPq/L86Ucr5mcZCvSwbOehcynXCjbbIXf3ZnAiMRzzjZTw4K+DyObefgATc0wQsf+/2tv F2d35kq5Z3kyBkE+N+/wU0ViCgo5bkgepaiTG6K+7hz0IyvZKTxf241T/RR3RP6lEBaKEp bh2VQcaSH8ecp4Y73Jutl7uzaMqvxANw+ap/3+dVyRjAijpzS6vw5NBLj55PQIm/pNM/MY 0UqW53gw5o81cqPkqWsbAix6oAtqEwp1SQ4UxvZ5FN76pfV666Ih5WGoB1y24ggSAMHcN3 gq+IfzuWNa0bcaLbLP1jv7t56HR6xa31FulHARBXA1tgZ/moKxNiZtm7tvyKmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765815112; a=rsa-sha256; cv=none; b=PvH6/BjNDORkWbW07AmxsA/4EPcL1Z+5/bhw5opNeMg8Ol6sP7uFyQ/eUZBdCLmnWn2abL E6vyLYTIu+qJrYV05+kDcb+z++i8u+82mXU855276mh5FSqLkZhcSzsPiYdTM7JQUwvAHK WD713x/Y/z/gLoeXUqgzD51flSoKMtsTFG/EjLzoh0/w+uCt+qsQj6fPPj0V23eScOrfkS zDBk/2MqnS7mzn9fQg5lm1AGf5PN2XlQkH7gt8zfte+pZzMO3GgIVQEtTnyMkD8Ykn8Fbt AGM9eD1rFyXDagM8Lib+dD6fVKhJIFJQDR3Hmcc57nuCVAHCbwCBAloCBRA8Ew== 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 4dVQ6v73L4zBJ0 for ; Mon, 15 Dec 2025 16:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 948f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 16:11:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 80523463ac36 - stable/14 - netmap: Fix error handling in nm_os_extmem_create() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 80523463ac36034945c2143a2ff184e1b922381c Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 16:11:51 +0000 Message-Id: <69403347.948f.2038c@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=80523463ac36034945c2143a2ff184e1b922381c commit 80523463ac36034945c2143a2ff184e1b922381c Author: Mark Johnston AuthorDate: 2025-10-17 12:55:17 +0000 Commit: Mark Johnston CommitDate: 2025-12-15 16:00:53 +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 6448fdc74160..1df97dd91400 100644 --- a/sys/dev/netmap/netmap_freebsd.c +++ b/sys/dev/netmap/netmap_freebsd.c @@ -738,6 +738,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;