From nobody Thu Nov 05 15:12:13 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 4jL5Q555pWz709Yh for ; Thu, 05 Nov 2026 15:12:13 +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 4jL5Q52gvzz4C9V for ; Thu, 05 Nov 2026 15:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793891533; 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=uEO9uyOOq5lMTfUNIQvAh1xckUI44EA34ghjh9YhwFo=; b=rg4IRc8JYzqBXxHv1RnvEwQ83t6ZcoU92e/flkKzIBHgGyh9HxEwxz7Gfct/o7tC3yvEam s35r1nXBJhta68cGVcQoiyf2wr8LO0thOebOEF9Rdm/glouUp6CDAqR1/Ainibl2U35Dzh uEGazSpNHRhQDRry88UZDwJpm9UEaZh3aA7iyjtqYbak/Z7woH7OrrN/31k3MZ4mgE5rBL BVjk/v/t/na/ezFDBqH5D2zhWuKDPcY4c5/hOafTPb7tlvMwGjOpFJBBF+3CRjjH+s1POf 2cpY9e/71hcNbCoYiFitpmghzHitNVH1aTmZocM1EuQ6cHhZ9KLaGVihtVSeEA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793891533; b=NBHRP5RAjKk/aBre/EFXGsBcI56PAZnmCSvi81sNIE+wykVXYhT5ob3aLWo5kgqFAUhYF9 8IYvbxEJv5CtQcskWG2SoCqJSaFjXuYUMP9tLuDrukTK+ygXPvzeJ9yKLZFs60ToEJ5uc+ zTXPCYnPBUJA4YxtaGveYgnPXrWC3JdxxFhOGNnhf/aCgbYKC6MrIBe6wsX7wYVPYenHV8 y4ul+nuUn5UgsCMZH+nWYekWBzDBIW9SMiynbcQtvyHr3Gpj0V1okJEM4dTSdyf+Yc7k9g 8uTApUhK1BXfAsZMOLSe7XA478peeZIvMkk11l3Tzx7NOm1z5ySgU7pvO2WmQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793891533; 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=uEO9uyOOq5lMTfUNIQvAh1xckUI44EA34ghjh9YhwFo=; b=mCeh9u4sGzYV1+Iq/c03qDP5nmZ2b9zASAz2k7drd6oIEBJhPy1GGgtUyISWh9/zpqaBTk 9UzWa90DGNF0AJsqRFyuuA+Im4Byy8ZUylxFsBgcVQITsTEknNdeYZq9qZ3Bib/026za9a QKEZMUgewhpjFlg9Dv4FgxLEmrhfmV9T5Ko6BwLZ0kzs5JJwAI3yak0050024HxP1wFAde rq19hLUB0WGNK369KGtnaIlHSCUWgj+cUs6esIqjt/8qdXsaGm2aNhkFWRPe5G2Kck84j5 Cw8P+ibUmV+l0LAaGNOJdfgroe89XnnEgC+Erv5LUdGLwE1rcSGkcmq5m49OSQ== 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 4jL5Q52JJ2zwNV for ; Thu, 05 Nov 2026 15:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 228f4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 15:12:13 +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: 031f3279a0a0 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 031f3279a0a07798d905ff296c86d71813b83be1 Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 15:12:13 +0000 Message-Id: <6aec9ccd.228f4.3d741602@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=031f3279a0a07798d905ff296c86d71813b83be1 commit 031f3279a0a07798d905ff296c86d71813b83be1 Author: Dag-Erling Smørgrav AuthorDate: 2026-09-30 16:55:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-05 15:11:52 +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); }