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

cfilters: fix Curl_pollset_poll() return code mixup

Browse Source 
Curl_conn_cf_poll did not map adjust_pollset failures to poll-style
errors properly, so error codes were treated as ready events.

Found by Codex Security

Closes #21231
This commit is contained in:
Daniel Stenberg 2026-04-05 17:44:01 +02:00
parent ecd09257d8
commit 4cb4f9d602
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/cfilters.c
View File

@ -832,12 +832,19 @@ CURLcode Curl_conn_adjust_pollset(struct Curl_easy *data,
return result;
}
/*
* Return values:
* -1 = error
* 0 = timeout
* N = number of structures with non zero revent fields
*/
int Curl_conn_cf_poll(struct Curl_cfilter *cf,
struct Curl_easy *data,
timediff_t timeout_ms)
{
struct easy_pollset ps;
int result;
int rc;
CURLcode result;
DEBUGASSERT(cf);
DEBUGASSERT(data);
@ -846,9 +853,11 @@ int Curl_conn_cf_poll(struct Curl_cfilter *cf,
result = Curl_conn_cf_adjust_pollset(cf, data, &ps);
if(!result)
result = Curl_pollset_poll(data, &ps, timeout_ms);
rc = Curl_pollset_poll(data, &ps, timeout_ms);
else
rc = -1;
Curl_pollset_cleanup(&ps);
return result;
return rc;
}
void Curl_conn_get_current_host(struct Curl_easy *data, int sockindex,

12
lib/select.c
View File

@ -642,13 +642,19 @@ CURLcode Curl_pollset_set(struct Curl_easy *data,
(!do_out ? CURL_POLL_OUT : 0));
}
/*
* Return values:
* -1 = error
* 0 = timeout
* N = number of structures with non zero revent fields
*/
int Curl_pollset_poll(struct Curl_easy *data,
struct easy_pollset *ps,
timediff_t timeout_ms)
{
struct pollfd *pfds;
unsigned int i, npfds;
int result;
int rc;
(void)data;
DEBUGASSERT(data);
@ -677,9 +683,9 @@ int Curl_pollset_poll(struct Curl_easy *data,
}
}
result = Curl_poll(pfds, npfds, timeout_ms);
rc = Curl_poll(pfds, npfds, timeout_ms);
curlx_free(pfds);
return result;
return rc;
}
void Curl_pollset_check(struct Curl_easy *data,