alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'contrib/github_pr_14196' into 'master'

Browse Source 
fix(esp_http_server): prevent concurrent access to socket used in async http requests (GitHub PR)

Closes IDFGH-13263 and IDFGH-13053

See merge request espressif/esp-idf!32267
This commit is contained in:
Mahavir Jain 2024-07-26 14:09:25 +08:00
commit 940578f9fe
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/esp_http_server/src/httpd_main.c
View File

@ -254,6 +254,11 @@ static int httpd_process_session(struct sock_db *session, void *context)
return 1; return 1;
} }
// session is busy in an async task, do not process here.
if (session->for_async_req) {
return 1;
}
process_session_context_t *ctx = (process_session_context_t *)context; process_session_context_t *ctx = (process_session_context_t *)context;
int fd = session->fd; int fd = session->fd;

3
components/esp_http_server/src/httpd_sess.c
View File

@ -72,6 +72,7 @@ static int enum_function(struct sock_db *session, void *context)
case HTTPD_TASK_INIT: case HTTPD_TASK_INIT:
session->fd = -1; session->fd = -1;
session->ctx = NULL; session->ctx = NULL;
session->for_async_req = false;
break; break;
// Get active session // Get active session
case HTTPD_TASK_GET_ACTIVE: case HTTPD_TASK_GET_ACTIVE:
@ -87,7 +88,7 @@ static int enum_function(struct sock_db *session, void *context)
break; break;
// Set descriptor // Set descriptor
case HTTPD_TASK_SET_DESCRIPTOR: case HTTPD_TASK_SET_DESCRIPTOR:
if (session->fd != -1) { if (session->fd != -1 && !session->for_async_req) {
FD_SET(session->fd, ctx->fdset); FD_SET(session->fd, ctx->fdset);
if (session->fd > ctx->max_fd) { if (session->fd > ctx->max_fd) {
ctx->max_fd = session->fd; ctx->max_fd = session->fd;

6
components/esp_http_server/src/httpd_txrx.c
View File

@ -631,9 +631,11 @@ esp_err_t httpd_req_async_handler_begin(httpd_req_t *r, httpd_req_t **out)
} }
memcpy(async_aux->resp_hdrs, r_aux->resp_hdrs, hd->config.max_resp_headers * sizeof(struct resp_hdr)); memcpy(async_aux->resp_hdrs, r_aux->resp_hdrs, hd->config.max_resp_headers * sizeof(struct resp_hdr));
// Prevent the main thread from reading the rest of the request after the handler returns.
r_aux->remaining_len = 0;
// mark socket as "in use" // mark socket as "in use"
struct httpd_req_aux *ra = r->aux; r_aux->sd->for_async_req = true;
ra->sd->for_async_req = true;
*out = async; *out = async;