git-market/curl-curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-11 12:01:42 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

openssl: fix handling of buffered data

Browse Source 
`SSL_pending()` only checks if the *current* TLS packet has more data.
There might be more data in SSL's buffers.

`SSL_has_pending()` only checks if there is data in buffers, but does
*not* check if there is a complete TLS packet that can be decoded.

If we only check the first, we will poll on socket events without having
processed all data and may stall. If we only check the second, we would
busy loop without SSL_read() ever giving something.

Add the flag `connssl->input_pending` that is set on incoming data in
the BIO receive. Clear the flag when encountering a CURLE_AGAIN on
the filters receive (via SSL_read()) or see an EOF.

Ref: #17596
Closes #17601
This commit is contained in:
Stefan Eissing 2025-06-12 08:45:20 +02:00 committed by Viktor Szakats
parent cbc062a7b8
commit 1cdac95e2e
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pingpong.c
View File

@ -116,11 +116,15 @@ CURLcode Curl_pp_statemach(struct Curl_easy *data,
else if(!pp->sendleft && Curl_conn_data_pending(data, FIRSTSOCKET))
/* We are receiving and there is data ready in the SSL library */
rc = 1;
else
else {
DEBUGF(infof(data, "pp_statematch, select, timeout=%" FMT_TIMEDIFF_T
", sendleft=%zu",
timeout_ms, pp->sendleft));
rc = Curl_socket_check(pp->sendleft ? CURL_SOCKET_BAD : sock, /* reading */
CURL_SOCKET_BAD,
pp->sendleft ? sock : CURL_SOCKET_BAD, /* writing */
interval_ms);
}
if(block) {
/* if we did not wait, we do not have to spend time on this now */

23
lib/vtls/openssl.c
View File

@ -769,8 +769,11 @@ static int ossl_bio_cf_in_read(BIO *bio, char *buf, int blen)
if(CURLE_AGAIN == result)
BIO_set_retry_read(bio);
}
else if(nread == 0) {
connssl->peer_closed = TRUE;
else {
/* feeding data to OpenSSL means SSL_read() might succeed */
connssl->input_pending = TRUE;
if(nread == 0)
connssl->peer_closed = TRUE;
}
/* Before returning server replies to the SSL instance, we need
@ -5216,13 +5219,8 @@ static bool ossl_data_pending(struct Curl_cfilter *cf,
const struct Curl_easy *data)
{
struct ssl_connect_data *connssl = cf->ctx;
struct ossl_ctx *octx = (struct ossl_ctx *)connssl->backend;
(void)data;
DEBUGASSERT(connssl && octx);
if(octx->ssl && SSL_pending(octx->ssl))
return TRUE;
return FALSE;
return connssl->input_pending;
}
static ssize_t ossl_send(struct Curl_cfilter *cf,
@ -5415,6 +5413,15 @@ static ssize_t ossl_recv(struct Curl_cfilter *cf,
}
out:
if(!nread || ((nread < 0) && (*curlcode == CURLE_AGAIN))) {
/* This happens when:
* - we read an EOF
* - OpenSSLs buffers are empty, there is no more data
* - OpenSSL read is blocked on writing something first
* - an incomplete TLS packet is buffered that cannot be read
* until more data arrives */
connssl->input_pending = FALSE;
}
return nread;
}

1
lib/vtls/vtls_int.h
View File

@ -127,6 +127,7 @@ struct ssl_connect_data {
BIT(use_alpn); /* if ALPN shall be used in handshake */
BIT(peer_closed); /* peer has closed connection */
BIT(prefs_checked); /* SSL preferences have been checked */
BIT(input_pending); /* data for SSL_read() may be available */
};