From nobody Thu Nov 05 15:12:36 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 4jL5QX56hZz709tG for ; Thu, 05 Nov 2026 15:12:36 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jL5QX1w38z4D4Y for ; Thu, 05 Nov 2026 15:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793891556; 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=/MGqn7filqdBzo7rfvouvA4k4ZpPGTc4jUKUgv6LmXk=; b=K/LflXCkcqwLmIP2Kv3xHAN5YmEbhmi7ACLFp8Jm72Sng+7k+JoWKKxEFZvLbSX+7h5Uus U9yhgnOeGC4+UjCadnxhUtzTh1pveD5Jh9O4JqejkonvkMDKrMoGHNEz2rsSKOt9fH0tDj aAKQfJ6MLttdUisrrGPraW7IJ8jizYP8odeD1qXnBYZdmafe4xmC+jdAPTDN3Qf35D579j +WfxlQbpCzAhR51Kfgx6zOsOY6OOOJh07kHObmPOtR6+6t1uGoBTq9Ju/X/a9/UtP+BExh vQlKzuJiFUF70O2TZQH2zUZ1EshOA9rVD0q/wNVe14VZzwSjk67aYV2UpN1rdg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793891556; b=HuSRxRcCE5qc6ncBaLju7RgNqlu7vhSU1XXrevYrPKebvYzlCnch0mcbRYJ7F7qnNX2kNT Zh8r2oiO+3Lh4gtmHBZaxXygqPndKTJcU4SEtxQm8TKLTAyxmQG/4q0UfsP5ifqJzC4643 OZ3WZIzyF28V42UDxUZsr5lNS/K3uFFV+oZlUz4K67E7KMsfDv2YEVvmnA4FxMITi71+JX 05V3qWWmsLtpIMSZocnj5IfCn0T0fe8xsRgLb4WLiooV6KBYA3e3g3IQQbKaOtePeBnzRf Y+uqjYaTwVrwBkJa96cETiRBufSCqDMsQT2cqRCtI720Q6t9VBTRiWScthInMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793891556; 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=/MGqn7filqdBzo7rfvouvA4k4ZpPGTc4jUKUgv6LmXk=; b=pSochYm1y+xNqW9CyXv+uFvUU9CNuG379plw2JdXQuybC2vktV0JZAkpVCSSV8BfK8b5c1 JCWXatNoSN2LaqeP3JeGrtfYHXOvyqgBnfBwwAaF6kgYiz+pCANwynA8PLm/kGp77y89E/ i0BEdF+VIvLGruTMuuEsPe++6MTk3YZPW39R8vUzhIdu6yug5zsq9aXFdko22lkJWhZPE/ jWh7uCwIaPIyvhjTAVbAJ+L1M3vUhtUjpBh+7U4jtVG2sne0gVLixR7yAt/x8pgjFso3kg gbE2nuPl20nB8ZUZOIer7BCKPWK4OM5Bk2eT038EDkf9bn6/AULQuQa7xXp/4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jL5QX1X7RzwQB for ; Thu, 05 Nov 2026 15:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24917 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 15:12:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 4de70ec0903a - stable/14 - libfetch: Plug connection leaks in FTP code List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4de70ec0903a91f58b057791c27cea594a89c32c Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 15:12:36 +0000 Message-Id: <6aec9ce4.24917.198364c2@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4de70ec0903a91f58b057791c27cea594a89c32c commit 4de70ec0903a91f58b057791c27cea594a89c32c Author: Dag-Erling Smørgrav AuthorDate: 2026-09-30 16:55:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-05 15:11:58 +0000 libfetch: Plug connection leaks in FTP code When setting up an FTP transfer, we need to dereference the cached connection before returning after a failure. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D60017 (cherry picked from commit 570869838f8bdaedb4c54953e80fe001a82190fd) --- lib/libfetch/ftp.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c index 4c1a63d3da82..14abf97b827f 100644 --- a/lib/libfetch/ftp.c +++ b/lib/libfetch/ftp.c @@ -1053,7 +1053,7 @@ ftp_cached_connect(struct url *url, struct url *purl, const char *flags) /* connect to server */ if ((conn = ftp_connect(url, purl, flags)) == NULL) return (NULL); - if (cached_connection) + if (cached_connection != NULL) ftp_disconnect(cached_connection); cached_connection = fetch_ref(conn); memcpy(&cached_host, url, sizeof(*url)); @@ -1100,6 +1100,7 @@ ftp_request(struct url *url, const char *op, struct url_stat *us, struct url *purl, const char *flags) { conn_t *conn; + FILE *f; int oflag; /* check if we should use HTTP instead */ @@ -1144,9 +1145,12 @@ ftp_request(struct url *url, const char *op, struct url_stat *us, oflag = O_RDONLY; /* initiate the transfer */ - return (ftp_transfer(conn, op, url->doc, oflag, url->offset, flags)); - + f = ftp_transfer(conn, op, url->doc, oflag, url->offset, flags); + if (f == NULL) + goto errsock; + return (f); errsock: + fetch_deref(conn); ftp_disconnect(conn); return (NULL); }