summaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-httpd/monkey/files/0002-server-scheduler-guard-protocol-close-callback.patch
diff options
context:
space:
mode:
authorGyorgy Sarvari <skandigraun@gmail.com>2026-04-20 09:46:09 +0200
committerKhem Raj <khem.raj@oss.qualcomm.com>2026-04-20 07:35:36 -0700
commitd31f07340fad43120f5e2ee4aee98cdec6f2717d (patch)
tree5eabdc1209b103730e67d27ea5f253cb7243f5ca /meta-webserver/recipes-httpd/monkey/files/0002-server-scheduler-guard-protocol-close-callback.patch
parent22277ca3a34083c27b5053bde58237e48b0e8799 (diff)
downloadmeta-openembedded-d31f07340fad43120f5e2ee4aee98cdec6f2717d.tar.gz
monkey: patch CVEs
These patches are about a number of CVEs files against the application: CVE-2025-63649, CVE-2025-63650, CVE-2025-63651, CVE-2025-63652, CVE-2025-63653, CVE-2025-63655, CVE-2025-63656, CVE-2025-63657 and CVE-2025-63658. These patches are taken from a pull request[1] that is referenced in the relevant bug report[2]. The patches don't target specific CVEs on separately, but they fix a number of CVEs altogether. Based on upstream analysis (in the linked issue) a number of these CVEs are duplicates of each other and/or not exploitable. The valid CVEs are fixed by these patches. I haven't added specific CVE info to the patches, one hand because of the above, it is hard to separate the patches by CVE, and secondarily because NVD tracks these CVEs with incorrect version info: NVD considers 1.8.6 fully fixed, even though the patches are only in the master branch, untagged at this time. After updating the recipe to 1.8.6+, the vulnerabilites will disappear from the CVE report due to this. [1]: https://github.com/monkey/monkey/pull/434 [2]: https://github.com/monkey/monkey/issues/426 Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
Diffstat (limited to 'meta-webserver/recipes-httpd/monkey/files/0002-server-scheduler-guard-protocol-close-callback.patch')
-rw-r--r--meta-webserver/recipes-httpd/monkey/files/0002-server-scheduler-guard-protocol-close-callback.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/meta-webserver/recipes-httpd/monkey/files/0002-server-scheduler-guard-protocol-close-callback.patch b/meta-webserver/recipes-httpd/monkey/files/0002-server-scheduler-guard-protocol-close-callback.patch
new file mode 100644
index 0000000000..c731db0919
--- /dev/null
+++ b/meta-webserver/recipes-httpd/monkey/files/0002-server-scheduler-guard-protocol-close-callback.patch
@@ -0,0 +1,51 @@
1From 82fb537e74e9b801d196b76efaf735ee50cd86c6 Mon Sep 17 00:00:00 2001
2From: Eduardo Silva <eduardo@chronosphere.io>
3Date: Thu, 9 Apr 2026 12:43:31 -0600
4Subject: [PATCH] server: scheduler: guard protocol close callback
5
6Avoid calling a null cb_close handler from the scheduler close
7and timeout paths.
8
9This fixes the HTTP/2 upgrade case where the protocol handler can be
10switched to mk_http2_handler even though that handler does not
11implement cb_close.
12
13Verified by rebuilding with cmake --build build.
14
15Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
16
17This patch is part of https://github.com/monkey/monkey/pull/434,
18containing assorted CVE fixes.
19
20Upstream-Status: Backport [https://github.com/monkey/monkey/commit/fc1d68fb38044df08cb43c7d9af0f68714388efc]
21Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
22---
23 mk_server/mk_scheduler.c | 8 +++++---
24 1 file changed, 5 insertions(+), 3 deletions(-)
25
26diff --git a/mk_server/mk_scheduler.c b/mk_server/mk_scheduler.c
27index a680d3cd..3cf0ba40 100644
28--- a/mk_server/mk_scheduler.c
29+++ b/mk_server/mk_scheduler.c
30@@ -598,8 +598,10 @@ int mk_sched_check_timeouts(struct mk_sched_worker *sched,
31 MK_TRACE("Scheduler, closing fd %i due TIMEOUT",
32 conn->event.fd);
33 MK_LT_SCHED(conn->event.fd, "TIMEOUT_CONN_PENDING");
34- conn->protocol->cb_close(conn, sched, MK_SCHED_CONN_TIMEOUT,
35- server);
36+ if (conn->protocol->cb_close) {
37+ conn->protocol->cb_close(conn, sched, MK_SCHED_CONN_TIMEOUT,
38+ server);
39+ }
40 mk_sched_drop_connection(conn, sched, server);
41 }
42 }
43@@ -749,7 +751,7 @@ int mk_sched_event_close(struct mk_sched_conn *conn,
44 MK_TRACE("[FD %i] Connection Handler, closed", conn->event.fd);
45 mk_event_del(sched->loop, &conn->event);
46
47- if (type != MK_EP_SOCKET_DONE) {
48+ if (type != MK_EP_SOCKET_DONE && conn->protocol->cb_close) {
49 conn->protocol->cb_close(conn, sched, type, server);
50 }
51 /*