From nobody Thu Oct 30 04:23:36 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 4cxrZy14LTz6Djct; Thu, 30 Oct 2025 04:23: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxrZx23Clz3Fl2; Thu, 30 Oct 2025 04:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761798217; 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=LCN5CmB46By6XWdyQFvBUy7h/ogo8zVpXJ97zuCh5Cw=; b=NIg+dwXxHNBWZNZGSJbU9uLhVwpGiCDvkeRxzqj9HD5h9xIXBV8UHP3To4wsml2mWYH9dK p/FZB4cwqdraXFOYLFv13F67z3Bor10QpZAfoCt1r8DcJXQwEvOzsVkf9ngu+ON9ItEUPZ rGyp8Rlb4Gl7ovlj4kcvJLFY1UReyShDtv9R/Wr/h27HBSRZAqgCzaOjuAJHw+1iAlrCll TEXmdLUwyJ2sKrxFl5AHfavobWEwJ4+uym8I9v60RDW+z3uI0fAKu62Z5Q7a2AFexoOp/D CLIlekexy6DUQIgtDajmSD0a1spxH+mBCJH8LTNt8e8++w3mhG2jf3fxMJUrLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761798217; 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=LCN5CmB46By6XWdyQFvBUy7h/ogo8zVpXJ97zuCh5Cw=; b=NC/0nsx4kwwOHKhptySCqtrGUbOKwoTe/OdcEDL0p2NotVfoS8rdoub9fzrkoWku7y6c5U hMdEPbY/XLp7a8BwTf2N18YrEL/8319nR3cbeSnNS9UPacie0JvQ8jAh4/mryJeKiyCIKm PI2cdLWQ14P74oYp6RgOA0ucHadZAKnFpfgUPlt9z3B+hUWwdNf5eAPL32pUoVUxNTUiam K4huJ9CjfzlBW8kDULvMFww4E245/oN+34tLpz/ZvZz56jKbK9apZfIOc8XDtXOb02GYa2 FYER7GwrcW3GQJih9GK96daXiUlaF//Fr4OzoGI+QR+Ryd9u8lkq1GMApxKQZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761798217; a=rsa-sha256; cv=none; b=uoUuzcyYmGuewNEQO4IzE9ZuGwjvxbqfa2BVhtOofGMe0O2/wxsAQ19QJVLZTi0evYUuAo 6TASxgueUYoUBhc4ccK1WzHBYUwCLUtFNqm7EXVpKCz2pTbRsRCjTMeUB3NF/Nk98ACHm2 b367Rxsfcg9Q/74pUu6F4h1KrRUk8pW+uPkmFCHl8PYbtGYF1ryaB0S2xGOSQYMr/2k1xU XHaNMJ38FC8/O+iCmstkaZKD6jfQVGcVIKX5gb/FvKeoZ9VAeoz9Oq1LUd64G4WQJoKu9p ET1bR8YwzR3DTZ48v3jd+wT6vvd1ThkfJqvTQC+MbTikL671jZuxThW6Pr3TeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxrZx03Tqz16Nf; Thu, 30 Oct 2025 04:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59U4NapB084224; Thu, 30 Oct 2025 04:23:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U4NaHI084220; Thu, 30 Oct 2025 04:23:36 GMT (envelope-from git) Date: Thu, 30 Oct 2025 04:23:36 GMT Message-Id: <202510300423.59U4NaHI084220@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 81a98c3a12e4 - releng/15.0 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 81a98c3a12e462243fffbe3332364bcbb4b499dc Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=81a98c3a12e462243fffbe3332364bcbb4b499dc commit 81a98c3a12e462243fffbe3332364bcbb4b499dc Author: Mark Johnston AuthorDate: 2025-10-17 12:55:17 +0000 Commit: Colin Percival CommitDate: 2025-10-30 04:22:28 +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. Approved by: re (cperciva) Reported by: Ilja van Sprundel Reviewed by: vmaffione MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53066 (cherry picked from commit dfc1041c08ba32f24b8050b4d635a0bbbfd9b767) (cherry picked from commit 6e1f47765d3cf425b2b0e56d79f38b94aa107e71) --- 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 8cc543d54c2e..ac267a66d669 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;