From nobody Wed Oct 29 12:50:25 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 4cxRt96GGZz6DfZX; Wed, 29 Oct 2025 12:50:25 +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 4cxRt95H16z4JL6; Wed, 29 Oct 2025 12:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761742225; 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=cgsrWaGmvPXYBIaTE7HaR2ShS1NxkejsSzlaW5q9IY4=; b=NFKsYrWCOkfHEb7RaHFkIdyVhm6MFaLIAg+XFtL3Lx95kKOjRUDBgPKtLgNI1VSeSPQjuK vPMNfGATtkCk2WT5Vj9c+7KzKj8eEGhbQll10GW3lbJVZ0f56MmlSI2tEzJzpxyP2ywgBy km2szl4NJAx0DcmlZHuz+eUbHWCcSGdMuKy/741IO6SE+oCe5v16NS5B9puuQJePpsGSPM VlgUa3zKPePTZCc/xqSKLOK6qW+3+coJbcffnQWPR8SukNF5J+BWJRCoGddvA2YdhzFhvD 5hV2pkMKG9+o4iWr0yHYJK2zo0vi1Mb2o7Q0ak06s0iwRoPn9/RPs2ikMgswZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761742225; 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=cgsrWaGmvPXYBIaTE7HaR2ShS1NxkejsSzlaW5q9IY4=; b=WPwt9/uUP59G/KHeivqtm2t1YLd2aA/OSgOgAIFahmQJEIw+ffjt7jsPEIStRogC6GSskn pWdvLxva4bRHmqie0yQGzfpFHqO6bKMeMTbHK085zLJoLr+bVtHT4dyZjzBfIkg2P8zZLY CTI8V17/oyw2Dtxcc129Cp658X+St1jyf061xNy/LO8Cw344kI6+DfyHuIcXqeXEWD0hVf AbV4LEEBJzPbDh0J1GcVJQnahARvDnVGZGHFocN520IUOsQmMDRGJoJVxhG0WSjfOZrExB cyFZTPwF0o+XPe1bgQxrzHxCwcfHdHOGawyQN3dWA01QOVg1ZQvTW+8kzpxQyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761742225; a=rsa-sha256; cv=none; b=bgP8FxxDqZZnYK14xUm+4HQ5zPn8eJ/VWH0I3xrmxMiF9xqmxVGDHRUU1RYp108p8R/SoF LHPq2otmQ7QCzNloMIYRSRVzIsyAkEnaOEaynvGszN/twjR8kuD0d0B+34cKVclP/am3ov PCtFH9Ps43vW4au9I7ITn7qWcldPEXfkIZRcH3xpdHL/L0zY5STiFRsWGWTPjZ41bs7UoU 6Y4kyVA5vRVMdknEYUu7K0Rf3DijWYUHDJuI/23qOVcX1BQ0R1iYAaCKLqwRZwXnTqSBo/ KuYTIxFdhLzY/RA79gEVM39VNFUWMQ4usPposO8P4FaSjs1aSzG4OR44OXSvNQ== 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 4cxRt94gbJzdFl; Wed, 29 Oct 2025 12:50:25 +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 59TCoPIq021077; Wed, 29 Oct 2025 12:50:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TCoPh9021074; Wed, 29 Oct 2025 12:50:25 GMT (envelope-from git) Date: Wed, 29 Oct 2025 12:50:25 GMT Message-Id: <202510291250.59TCoPh9021074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6e1f47765d3c - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 6e1f47765d3cf425b2b0e56d79f38b94aa107e71 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6e1f47765d3cf425b2b0e56d79f38b94aa107e71 commit 6e1f47765d3cf425b2b0e56d79f38b94aa107e71 Author: Mark Johnston AuthorDate: 2025-10-17 12:55:17 +0000 Commit: Mark Johnston CommitDate: 2025-10-29 12:46:49 +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 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;