From nobody Fri Oct 17 13:00:09 2025 X-Original-To: dev-commits-src-main@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 4cp4fx4sbTz6DFjY; Fri, 17 Oct 2025 13:00:09 +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 4cp4fx40ksz3b9L; Fri, 17 Oct 2025 13:00:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760706009; 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=tI1VRopkQy4Fh+uXUhD8KlxhhTe3UZb4w2PtaBtOP2s=; b=sDl8pnTEvU05fGu+MBCVX23taR0gQXnKVNgq1tkWM0tAKvzJbHteTNnrLBi7X3Gjn4JGjR /GmaXPPaD/4g3IugSZq4jC5wz43GX41xnX1HBu/xNyLLmj42oRr4QMgbHK7VuDohl03JrS CnD8T2ORB5cTKFYarZuv4LIWXBHeLoRUJMkOEnQiS8+y4tqV64/eaByTfEuC2TU36rNBt7 tLhPe/8/plaGfX0v7+0Z/gp7JFj9aPJrljBzvGCXxhi7MH63m99etpBR5WFU6aC925+hJU GouamEmWhTWpZoW7unvjUkQHtJtmMZmtJmFZttrCV8XqgSTwNpKW5IUjzaasEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760706009; 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=tI1VRopkQy4Fh+uXUhD8KlxhhTe3UZb4w2PtaBtOP2s=; b=nO/OVzf8/ryttK/NTB/A6HCYDglByWTN2k8+M8GkoiPTqJPpE9TaOXGE1XvRckrUrYliA4 ljWdndk6bvPtDgnosztAfTfhcj3xE+h5n8m5XLu412/HhSQB09Fo4ynKYHGOeHB3avHgPo EpaJ1/mdTD6FWtwnhG5hBOyQwUGY9DNKzaLDwwFqmUr23/RkC8cCpUYCOXirT4cxzj+rk3 2fpaDMO23zK0PnAe7djtqK2D23uvXcDLAOsfBcxbxoHuLUjSYGeZh/NRjmGitDeOoixjPm MeR5mPKBpLAAOKeJg1ic00uX/+9+f50O7TEFNV31TUjv6xcBg61gKOlIEq1Uyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760706009; a=rsa-sha256; cv=none; b=n6qBI6qyAkhZiXNKbVdDUnQaVWGFYkfDcgTcec879Na5PIq5cACGivlcqIhK9HsuGdyX5K e/9V4OuAPT2n4Ju04s3pMrr3A/oCus6uUVFgeVgj7hD3u7acza5VQgkq5PhpYgwvxOP0z0 XvRNKsRqEtNKVfbCeyWV/jusTQ4tCX3BHa9bqhG3y8JG5mDTdA7+KClO2oVKjJT2NNspjZ plb8ks0RysRMmoMtJZ44577mw1C8c8lcQuYb/oVILLQe7o79ojkc61oMSMxvjevK31uxPu uB+loZEv859jvwbriP35GdPu0lqvRmmwyvK/2+RnqwiR4WPwkkMzBiPUADaZyQ== 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 4cp4fx3RhDzwJp; Fri, 17 Oct 2025 13:00:09 +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 59HD09N9024287; Fri, 17 Oct 2025 13:00:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59HD096T024282; Fri, 17 Oct 2025 13:00:09 GMT (envelope-from git) Date: Fri, 17 Oct 2025 13:00:09 GMT Message-Id: <202510171300.59HD096T024282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: dfc1041c08ba - main - netmap: Fix error handling in nm_os_extmem_create() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: dfc1041c08ba32f24b8050b4d635a0bbbfd9b767 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dfc1041c08ba32f24b8050b4d635a0bbbfd9b767 commit dfc1041c08ba32f24b8050b4d635a0bbbfd9b767 Author: Mark Johnston AuthorDate: 2025-10-17 12:55:17 +0000 Commit: Mark Johnston CommitDate: 2025-10-17 12:55:17 +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 --- 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;