From nobody Thu Nov 05 15:12:38 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 4jL5QZ5Rfpz709tK for ; Thu, 05 Nov 2026 15:12:38 +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 4jL5QZ4BDjz4CvD for ; Thu, 05 Nov 2026 15:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793891558; 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=mg9bRWrhTnI5XWIE3qZIjxLgzQb6H0JqilCdBKRddgM=; b=EWjtpMmCOua2iXHPwWCjxM10HThYDN+Zpffrmdh/7l9VxS3s8f4MB/fLRazW1UmXaYC31/ FFT1t4XZt3I6bC0sBBTW8mwHTPVtIVCnManhVrWN0g6V0U/92DCsD/ALTfM9QJq5KXGIsp Mfow3Uy2hORsRnYRN/aH0IyTd/4c6imsTTKHkYUC0x9cS8WW2g3AHeA7JtDr05sxG8+aA1 RPkRX5WCwlstB3FhMiRdc9H/dMuBta1mzcqu5kPvJAkNX72jrb/agG12uMDWo52mVOH57u ewrBQcs3QqyhdpM50bAM1mUXcwQ8X5H7wHjnlvY0VcRht7Hx3gffH5MCB2kBFg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793891558; b=NiIq8KRW7McMK+q4GhkYkqTssRqj4eu7kIcnNv/vxYfCafUQn+DtAmENcG4BOYW0bBEX95 p0jsCXSXLhrvAB39jSjTLJG8JAo44iQ+EcHg8Z3YwZ9z1aULtKAnYL7KoOpwiVxwGbAIwh yGUXKkM16G90KA6+aLz3Nbx4j/bKS4XSYXrbxWWBmVZyJDBVZbQHgI4aKZq5qjzIqnux/I ciVZ2Kcyz/kv29gtCPiVa7w/GhAvutA5/nDktbYuZGsbFQkqBCo43fliKwv/rp/pkHfnox ewKSDy2vZRsOE/1GCKZuo9TodR7q1/YPXNUObveKhPVRGLWBit+z5h0XjC9LCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793891558; 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=mg9bRWrhTnI5XWIE3qZIjxLgzQb6H0JqilCdBKRddgM=; b=cQlwDp5qd69ewTkM+N4k26F34CMaZtOjUerIDUQZIql651LfG+TxprGql8sbYBb3oLpFoP mS1EDrpgM1JM+NCMBHn4XQ3CDQz81hbY2/zz37W/u8a4pWtnOu7bjCrgUriOnHEO9hTT8I T8p3NcB+pBHYyABs22IGyMwclpDiksu9q3zPUJxsyNzQcQIK/dEMjjpV5/2Zp3TliJprIo sTdbgFGzgCUAuDRxCVSRTn697+leUy6PkAuN4UobW502u1T6KUsSIJv/jobstE+bR1vGd+ 2IALt/KVdwmfnVaJXcdsujk4cfbxd5S/Um/jLyRU8/JAF3B2krkMr54iy2PHMw== 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 4jL5QZ3JvgzwBQ for ; Thu, 05 Nov 2026 15:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24a0b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 15:12:38 +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: 3b6ba9318089 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 3b6ba9318089f24d937e63390c23bb711cc90ac1 Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 15:12:38 +0000 Message-Id: <6aec9ce6.24a0b.3341bee1@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3b6ba9318089f24d937e63390c23bb711cc90ac1 commit 3b6ba9318089f24d937e63390c23bb711cc90ac1 Author: Dag-Erling Smørgrav AuthorDate: 2026-11-02 12:27:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-05 15:11:58 +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 f813aa514eb4..5ebaee23e084 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -1220,7 +1220,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; @@ -1252,13 +1254,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);