From nobody Thu Nov 05 15:12:15 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 4jL5Q84lzyz709WZ for ; Thu, 05 Nov 2026 15:12:16 +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 4jL5Q75ZpXz4BsK for ; Thu, 05 Nov 2026 15:12:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793891535; 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=qtl1E/7/VDhweu931uEUDMf+W8lH4v5SIGOTnFKk38Q=; b=PWAv5iDxJxU+OYDIxzgJjDJneeeGbgoS4saCG+tD+ikeAzNDxVz/iVTNjb3x+tngW2Tlx/ sfPjgRetaS7oyB0sOkIYg1e54LwgzYojCUyQbzbYQ74+k7FxQ2lqGWT+/4Ahf0uTTkDfQ/ mpehPrVWX7aeEDPGlr/tIR1TZ4m6J1Z+pGS2y3a0xDfpO4MtDdHEX+eWu5oM3NGYHiAgRL RfqAI1vFaC7yQ+turf+OMnMqeqoKo5PHTytdC/8WEPEA7G6XbfVbzxVoYpZ18zPM3Dl51W 4qvSr8UUfyKSqdRQfDE5X5yyWKL5Mze7EeZo8JS2H0ElAHE6TJGuoBvZHldtGA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793891535; b=tF6AV//B/IQs+4DfN6HjfXhxlcZKOAVYpCwb7bXVyNqGuW97JrXFmmP4gj85P2RgC4kfFK AgY9JbZkHfnxnj+8H3swVVkX1aSXOftJelk0QROc/MAq0U9ZZpNs+n+1vIYAxZj37EtV8C ooDtC7kX+bTHgCoOC+8RefE4M5TWoefKhWQP5KMSuQRJv9u+1mDPVCoC1Mgf1cwXz/DEcI klqURWTop+JtdXFXFYL8QXJ2Iw9ZrQ5gDVgOdalw3L2j8HvmvokyffVG5Q2jyLytFofDMS NkeKxroIWfG50l82bcEsNTevzyArAB9XZvCK9DzxtJ+xl6TcU4q0kX+pteD7kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793891535; 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=qtl1E/7/VDhweu931uEUDMf+W8lH4v5SIGOTnFKk38Q=; b=ntccitOki/Cqa6yUyo6+XSbmId9lWN9po7K6j2xJ0Fn05b0YhMhmN8mhg3oFsukKzMi0aT 1v/MoGinTsXDKitz2tnO5O1A9kZYeq3/Py68EfOHVNiMUDB+HYXx6lOctTzm0qIpSzQI7e Ko3JIcmNmzuNMFhFdNHys2VBWLjh0kGq1tiCtTBum7Dmj916CIAMFw+rXDRbmPorwVJlJL bomGCPJvXleSV9CnH1azf5kTq8LN66ChujsL1guV5CeqatIi16wxnfTCtP23TfVXsOB1T5 ubpBvTDJiJ9qglGgvKZmKtkaylMFZ11kGJaQoP1B+VYfKRGc0H8Gq/IBf1GrAg== 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 4jL5Q741v1zvqt for ; Thu, 05 Nov 2026 15:12:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25283 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 15:12:15 +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: b147483845c8 - stable/15 - libfetch: Apply timeout to SSL handshake 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: b147483845c8f28fed73e32a01500548cbf40317 Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 15:12:15 +0000 Message-Id: <6aec9ccf.25283.1b19b6d4@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b147483845c8f28fed73e32a01500548cbf40317 commit b147483845c8f28fed73e32a01500548cbf40317 Author: Dag-Erling Smørgrav AuthorDate: 2026-11-02 12:27:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-05 15:11:52 +0000 libfetch: Apply timeout to SSL handshake When the SSL handshake cannot proceed because the server is slow to respond, poll() with a timeout instead of spinning. MFC after: 1 week PR: 298962 Event: Oslo Hackathon 2026 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D60975 (cherry picked from commit d6678851308d3cec767f07b0712a429cdc5895de) --- lib/libfetch/common.c | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index da0ea6f8aaeb..c15b22a41603 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -1219,7 +1219,9 @@ int fetch_ssl(conn_t *conn, const struct url *URL, int verbose) { #ifdef WITH_SSL - int ret, ssl_err; + struct timeval now, timeout, delta; + struct pollfd pfd; + int deltams, ret, ssl_err; X509_NAME *name; char *str; @@ -1251,13 +1253,47 @@ fetch_ssl(conn_t *conn, const struct url *URL, int verbose) return (-1); } #endif + if (fetchTimeout > 0) { + gettimeofday(&timeout, NULL); + timeout.tv_sec += fetchTimeout; + } + deltams = INFTIM; + pfd.fd = conn->sd; while ((ret = SSL_connect(conn->ssl)) == -1) { ssl_err = SSL_get_error(conn->ssl, ret); - if (ssl_err != SSL_ERROR_WANT_READ && - ssl_err != SSL_ERROR_WANT_WRITE) { + switch (ssl_err) { + case SSL_ERROR_WANT_READ: + pfd.events = POLLIN; + break; + case SSL_ERROR_WANT_WRITE: + pfd.events = POLLOUT; + break; + default: ERR_print_errors_fp(stderr); return (-1); } + /* check what's left of our timeout */ + if (fetchTimeout > 0) { + gettimeofday(&now, NULL); + if (!timercmp(&timeout, &now, >)) { + errno = ETIMEDOUT; + fetch_syserr(); + return (-1); + } + timersub(&timeout, &now, &delta); + deltams = delta.tv_sec * 1000 + + delta.tv_usec / 1000; + } + ret = poll(&pfd, 1, deltams); + if (ret == 0) { + fetch_info("SSL handshake timed out"); + return (-1); + } + if (ret < 0) { + if (errno == EINTR && fetchRestartCalls) + continue; + return (-1); + } } conn->ssl_cert = SSL_get_peer_certificate(conn->ssl);