From nobody Mon Jul 27 03:44:44 2026 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 4h7kxS3qLkz6mSTY for ; Mon, 27 Jul 2026 03:44:44 +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 4h7kxS39BHz3gT2 for ; Mon, 27 Jul 2026 03:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785123884; 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=lBkn9Ssm1wd8qx5voebZb5h37Sa/caNvgWgkrksYh0M=; b=muZQFJgZjawWMO75N8TxH5qjVneU9krPA7HGqqkomnIuVqRKnO+H8M3dqF8f1k9f5PKyA3 bQGWqSy0vyAGIlQatRSHXs0BxGKTGTl1yf+MqFODOaRuCs1q0i2ywf4XbEz6483xvh45E0 fEQALN/VaIPDw4d9VRCl7/jSpQQCk9flD8xs7PLZwzqTX0GvZ1/uvcCDhD/RaExlKSqePg +YQDmj2I0l+Egle0c7JxVqtzIcDkRPZJiD4u5sf+ngMIyXdmarazm14Wj8zRlskSHTmwnj JgS3II7X97WtwSX3a8axDPB36N8N76c+nY8reU6JzoRd6H3c/d7W/dzzQmGOxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785123884; a=rsa-sha256; cv=none; b=IoLpza/rjXl30yNzDDwpE7MzFV1eeaTePC68ZsXTd/IE+X5+ttJiT3atwhSCf9fGij1RIL KPol+nIzgo5zwUlIzKYQVrIf6jkr2fBUJXABjES3WyIZIqOZiOKaBjheMHiN2/61wmsVV3 hTmBPkxbMDrGugv/yZMirTPU2VW0vzC0EISNwbOzjv0rjyHUUDufocYK/04mOUTWoygSVq IROFX76Uc1FHzCVmX54n8PprNV/1i+29H0GhiwYQGMbnGRxCyXry+1DODVCNuKvpiSZqqK YFnxZqU8rgGfHU+A6ZxcN+lLQeJiMcY5QcMo4CgdS168JK+PZxkAgTMhoP+1vQ== 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=1785123884; 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=lBkn9Ssm1wd8qx5voebZb5h37Sa/caNvgWgkrksYh0M=; b=mI/kITiV+zDVZqPcD3WVAX2EV0i2DB+m2/OAcsbpS04EmG/eV7doHZ4hwRN2DCh1LqM3MI WcOfmQOtDGFdtaAS8nU76VhyhJlBEucZ47hQwmw7/xEgFCCfOiVLYRl6xOWH9pw5SdaJsa oBGSQ6d3ZKukxSZn1Z0WomNAyrOyg+dmraONfGOZeBNrIOGZ5UWbG5QhAXxJxc2p3qfqko Fd317k47pLXoe6mvz9WJkj5UK7q1Yws3IXfgNCoeL+BnTHxWByb6/si/PrCe5gYhmvOyxu /89qnAE/5UXN+arcp8Ibqa38JhGfTEzalh+yCC2hStFZ8uU/9NqOeM3vEqWnug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h7kxS29hxzs9C for ; Mon, 27 Jul 2026 03:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bee9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 03:44:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: cf4bb6f4aa7f - stable/15 - libnetmap: fix error path in nmport_extmem_from_file 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 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/15 X-Git-Reftype: branch X-Git-Commit: cf4bb6f4aa7f39e66434f73d65bd08261deea792 Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 03:44:44 +0000 Message-Id: <6a66d42c.1bee9.77c38882@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=cf4bb6f4aa7f39e66434f73d65bd08261deea792 commit cf4bb6f4aa7f39e66434f73d65bd08261deea792 Author: Jose Luis Duran AuthorDate: 2026-07-13 12:23:14 +0000 Commit: Jose Luis Duran CommitDate: 2026-07-27 03:40:43 +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);