francis.wang
4c86c082a2
Combine poky (Yocto scarthgap), meta-openembedded (scarthgap), and meta-openwrt into a single repository. Components: - poky/ Yocto core framework (BitBake + OE-Core) - meta-openembedded/ Community layers (meta-oe, meta-python, meta-networking) - meta-openwrt/ OpenWrt customization layer - setup-env.sh One-click build environment setup - README.md Project documentation
92 lines
3.1 KiB
Diff
92 lines
3.1 KiB
Diff
From 7b5bea14a2a7a784751a8f86559bd3c3f109ed5b Mon Sep 17 00:00:00 2001
|
|
From: Sergey Kandaurov <pluknet@nginx.com>
|
|
Date: Wed, 29 Apr 2026 23:02:20 +0400
|
|
Subject: [PATCH 2/2] Upstream: fixed parsing of split status lines
|
|
|
|
If the first response line was split across reads and it didn't appear
|
|
a status line, the portion already processed was lost. To preserve ABI,
|
|
the change reuses r->header_name_start for proper backtracking on status
|
|
line fallback.
|
|
|
|
CVE: CVE-2026-42946
|
|
Upstream-Status: Backport [https://github.com/nginx/nginx/commit/39d7d0ba0799fcff6baee52b6525f45739593cfd]
|
|
Signed-off-by: Theo Gaige (Schneider Electric) <tgaige.opensource@witekio.com>
|
|
---
|
|
src/http/modules/ngx_http_proxy_module.c | 5 +++++
|
|
src/http/modules/ngx_http_scgi_module.c | 5 +++++
|
|
src/http/modules/ngx_http_uwsgi_module.c | 5 +++++
|
|
3 files changed, 15 insertions(+)
|
|
|
|
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
|
|
index 9cc202c..19cbfa3 100644
|
|
--- a/src/http/modules/ngx_http_proxy_module.c
|
|
+++ b/src/http/modules/ngx_http_proxy_module.c
|
|
@@ -1814,6 +1814,10 @@ ngx_http_proxy_process_status_line(ngx_http_request_t *r)
|
|
|
|
u = r->upstream;
|
|
|
|
+ if (r->state == 0) {
|
|
+ r->header_name_start = u->buffer.pos;
|
|
+ }
|
|
+
|
|
rc = ngx_http_parse_status_line(r, &u->buffer, &ctx->status);
|
|
|
|
if (rc == NGX_AGAIN) {
|
|
@@ -1821,6 +1825,7 @@ ngx_http_proxy_process_status_line(ngx_http_request_t *r)
|
|
}
|
|
|
|
if (rc == NGX_ERROR) {
|
|
+ u->buffer.pos = r->header_name_start;
|
|
|
|
#if (NGX_HTTP_CACHE)
|
|
|
|
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
|
|
index 3259820..a04fd47 100644
|
|
--- a/src/http/modules/ngx_http_scgi_module.c
|
|
+++ b/src/http/modules/ngx_http_scgi_module.c
|
|
@@ -1021,6 +1021,10 @@ ngx_http_scgi_process_status_line(ngx_http_request_t *r)
|
|
|
|
u = r->upstream;
|
|
|
|
+ if (r->state == 0) {
|
|
+ r->header_name_start = u->buffer.pos;
|
|
+ }
|
|
+
|
|
rc = ngx_http_parse_status_line(r, &u->buffer, status);
|
|
|
|
if (rc == NGX_AGAIN) {
|
|
@@ -1029,6 +1033,7 @@ ngx_http_scgi_process_status_line(ngx_http_request_t *r)
|
|
|
|
if (rc == NGX_ERROR) {
|
|
u->process_header = ngx_http_scgi_process_header;
|
|
+ u->buffer.pos = r->header_name_start;
|
|
r->state = 0;
|
|
return ngx_http_scgi_process_header(r);
|
|
}
|
|
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
|
|
index 93bcad7..749254f 100644
|
|
--- a/src/http/modules/ngx_http_uwsgi_module.c
|
|
+++ b/src/http/modules/ngx_http_uwsgi_module.c
|
|
@@ -1249,6 +1249,10 @@ ngx_http_uwsgi_process_status_line(ngx_http_request_t *r)
|
|
|
|
u = r->upstream;
|
|
|
|
+ if (r->state == 0) {
|
|
+ r->header_name_start = u->buffer.pos;
|
|
+ }
|
|
+
|
|
rc = ngx_http_parse_status_line(r, &u->buffer, status);
|
|
|
|
if (rc == NGX_AGAIN) {
|
|
@@ -1257,6 +1261,7 @@ ngx_http_uwsgi_process_status_line(ngx_http_request_t *r)
|
|
|
|
if (rc == NGX_ERROR) {
|
|
u->process_header = ngx_http_uwsgi_process_header;
|
|
+ u->buffer.pos = r->header_name_start;
|
|
r->state = 0;
|
|
return ngx_http_uwsgi_process_header(r);
|
|
}
|
|
--
|
|
2.43.0
|
|
|