From nobody Wed Sep 30 16:55:51 2026 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 4hw1QH3v4vz6tpmK for ; Wed, 30 Sep 2026 16:55:51 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hw1QH1YFhz4k4k for ; Wed, 30 Sep 2026 16:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790787351; 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=icIRoNh+Man8z/oWikdsmcEjT25zlMy+iHKvKKUKxFU=; b=rCWkW08yvqXSsrhoKlNubZRy+Jty/xfvjARINU1MR9fxw3De47K8EJGPTqMVRxCzr0IXd3 6QObf+VJ3g7I/BCaaufohOcg7AUWUOGwdWe8krJg+rkd4f3MFlhow4JZB/2tKZ/ZGBlD42 TBycO4CnB2KMfgHfL2xuSGBq7VGBw57H4VCN0nd8qwgkesGEQBid3fUMz+t0402yawNlOm EWO0Eca9dzZXhN3qOrpoa1ppM9F+/8eFyuHEHfhBuqo7Z5mpyj0x4tU9pyPID8KyxldHTF pxV+XrPxocSslibO7/HUNVbRuj5LFNZX+h3p7SQRx9+fn+LG9N9BfTmd28DLew== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790787351; b=lvMAA+1govC+fBamtloXSNSln66WBEJdQQ8NiGP/4c7R9Tes5tXjQ0Xo0N2ljDb96TqE3R wjuhh3f1jDmfReClMia3BT3Lz+IsTAlYExS7djW8b5jezjpBd7pbW2txwoKaGVG8wMHlRy 7I/jh1AT2JUOHf0Y7aoZW+fu2C9IqsOxi5Tr1I3nDS7ZLh7eu0fHdhKSzFaMjPme/MANm4 +adWUjMKl3+YLszn0vJp1es+TB4Bc/HLbrvJTB4I7CPdthf++kKoUY7pC4gctAlFyZTPZh SJBMt5iqdwbGUvIpylBdTNXqmLCeofhrcXZD7b2huf/E+IRcRJw9leYpmX+gIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790787351; 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=icIRoNh+Man8z/oWikdsmcEjT25zlMy+iHKvKKUKxFU=; b=DrevR+SC34j9B7b/I9QF2JwTE9Rcv7OjvvWTkJPmGm7RKk7UTP0Jr4BmfZGhrkX9CATnRj vkMlvTPEBeeDqaqXfKpAsscDVd1bFHgP4XWEx96qJfbT1KLeYUEEf15z3L13BY6esPnzU0 8Ovr5PbTlaT0AIVWxqH4xK+QRcQz0yMewOdflYjqrWQZwNI3wY5nLEjdV83x+nWdhs1vx3 SQhPIm1lytKVv++VCQg+VcgxEEUScrOmnuellieYcn9CNsQvkf3/JkJsU/bjoaA6Rba2I1 Zrj3W83yHUU3Dw5Tox6AD2zSmU940oFnVnj8ZqNkvB93aDugzrxYQQY67qTKMA== 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 4hw1QH0Ygwzv4t for ; Wed, 30 Sep 2026 16:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a6a7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 30 Sep 2026 16:55:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 570869838f8b - main - libfetch: Plug connection leaks in FTP code 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 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 570869838f8bdaedb4c54953e80fe001a82190fd Auto-Submitted: auto-generated Date: Wed, 30 Sep 2026 16:55:51 +0000 Message-Id: <6abd3f17.3a6a7.30c77955@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=570869838f8bdaedb4c54953e80fe001a82190fd commit 570869838f8bdaedb4c54953e80fe001a82190fd Author: Dag-Erling Smørgrav AuthorDate: 2026-09-30 16:55:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-09-30 16:55:23 +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 --- 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); }