From nobody Mon Jul 27 03:45:19 2026 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 4h7ky73KRwz6mSkP for ; Mon, 27 Jul 2026 03:45:19 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h7ky71l0Kz3hGP for ; Mon, 27 Jul 2026 03:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785123919; 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=FgheMwFrsF5BVND8q7NkA5tC+/eOUMsLTxLWNz8aq2I=; b=LM1nTCDxyJl/vQA/9Q4vPQcbflOF3IK0Z++lAehbjBe9BcYFWA8fr9L7Fp3RSO5klcInPC rb6UnRGIXsa6KCy0J5RnMDE2pIYJqcTItTvpR1nVqoicSvwa6fZo+BlkbgMuHJkLzChwVX lxZsxBlNCQJX16g2KZGTnnFU2y0KCy2CNn3drlxXZOC+p9CkhzasqHxo+j3Axbv2NFk00z /wF91NipVIufnBHaaZchw+EhCoG6IgrmNKq65adGf7qUA4OtcI/+N5O94JsjIoamafC4eW FWsNMbaFho9O1aRrGvmzZG1r9HNU2oiTXnJvxf46UGdi44Sp5faUd9o4zuporA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785123919; a=rsa-sha256; cv=none; b=JmgrtHD+2pNNJu+ODlvOflrEFNOXHJ1Il0jO9aHZLgXKDV3ON13yI2J3xUuzQeALG2xgrm n4VzG4ClLLZjlT3h4NcsguNd+71N9xx/E9826+2s55kAVR6hkH7qZw2b5d/sIaXX/wC+4K DGODrwYke0fnFOSj1IZDWj8Hj8Bq22MGs+lIRBar2D9kf276cVANoenHERiD1JNaQ/0Tet jYG6XjQZJ9q0zSCpEqRHCuARdAoUyheOPLhA6Bt85iJC2k25dvMI6TUQUHnyOpNBUndWKx LIhfJ0hXD8tImSnzOUBY5Bj096czji8I2ccFk/gn/lS1h3Gj7RjpWiXBrS/l7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785123919; 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=FgheMwFrsF5BVND8q7NkA5tC+/eOUMsLTxLWNz8aq2I=; b=AwCSVPPeHpclFMsEsfDG8rGEfcwHkPYD+AQ34wibxkka2N8LeVCnchqZJtEsvqoG7Chgva NfEwy4MKV/ByAyWahjAk1Mqam+/XZ1VfnIDzVQOlnquoVDFFbMszrvhc69AKHewztMFLrx IuguUtKi61+aQnnJp4KTSUXkwKLMSvWfe54QnGe8hRA+pC9/RNLDOv1mTMRO+3TBM8e0+n kgsHHHwDonbEXjq9x72kisa3FUXydFYpg79fLR4uxHyR3m1ycDtzWbZxEnPubM3DifMfei gxxlcGcSDHdz/YMcM3ySiQYciMtVU2l52vkZVPO+NUcgph2p2rbkNtDLVUdgaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h7ky70LV9zs1Q for ; Mon, 27 Jul 2026 03:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e777 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 03:45:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: bb8c5e484f52 - stable/14 - libnetmap: fix error path in nmport_extmem_from_file 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bb8c5e484f5278535154cf93f1f7a8d8c51983f0 Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 03:45:19 +0000 Message-Id: <6a66d44f.1e777.5e46c0fd@gitrepo.freebsd.org> The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=bb8c5e484f5278535154cf93f1f7a8d8c51983f0 commit bb8c5e484f5278535154cf93f1f7a8d8c51983f0 Author: Jose Luis Duran AuthorDate: 2026-07-13 12:23:14 +0000 Commit: Jose Luis Duran CommitDate: 2026-07-27 03:42:12 +0000 libnetmap: fix error path in nmport_extmem_from_file Reviewed by: zlei, vmaffione Obtained from: https://github.com/luigirizzo/netmap/commit/b52a2bcae35e56548acfb0849b248a1e4b0c0c3b MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D58150 (cherry picked from commit fcaf15e54162fe14483fdf4ac28c67c51e424441) --- lib/libnetmap/nmport.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libnetmap/nmport.c b/lib/libnetmap/nmport.c index ec9c6136f0f8..c892c94db32e 100644 --- a/lib/libnetmap/nmport.c +++ b/lib/libnetmap/nmport.c @@ -198,6 +198,7 @@ nmport_extmem_from_file(struct nmport_d *d, const char *fname) errno = ENOMEM; goto fail; } + clnup->up.cleanup = NULL; fd = open(fname, O_RDWR); if (fd < 0) { @@ -215,6 +216,7 @@ nmport_extmem_from_file(struct nmport_d *d, const char *fname) goto fail; } close(fd); + fd = -1; clnup->p = p; clnup->size = mapsize; @@ -230,7 +232,7 @@ fail: if (fd >= 0) close(fd); if (clnup != NULL) { - if (clnup->p != MAP_FAILED) + if (clnup->up.cleanup != NULL) nmport_pop_cleanup(d); else nmctx_free(ctx, clnup);