diff options
| -rw-r--r-- | meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2025-63938.patch | 43 | ||||
| -rw-r--r-- | meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.3.bb (renamed from meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb) | 3 |
2 files changed, 1 insertions, 45 deletions
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2025-63938.patch b/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2025-63938.patch deleted file mode 100644 index e06e0d3eae..0000000000 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2025-63938.patch +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | From cee659d2ac1e4e9d1ce388338f46df6c4bae8278 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Fri, 17 Oct 2025 22:57:39 +0000 | ||
| 4 | Subject: [PATCH] reqs: fix integer overflow in port number processing | ||
| 5 | |||
| 6 | From: rofl0r <rofl0r@users.noreply.github.com> | ||
| 7 | |||
| 8 | closes #586 | ||
| 9 | |||
| 10 | CVE: CVE-2025-63938 | ||
| 11 | Upstream-Status: Backport [https://github.com/tinyproxy/tinyproxy/commit/3c0fde94981b025271ffa1788ae425257841bf5a] | ||
| 12 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 13 | --- | ||
| 14 | src/reqs.c | 9 ++++++--- | ||
| 15 | 1 file changed, 6 insertions(+), 3 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/src/reqs.c b/src/reqs.c | ||
| 18 | index a65ed54..1e5895c 100644 | ||
| 19 | --- a/src/reqs.c | ||
| 20 | +++ b/src/reqs.c | ||
| 21 | @@ -174,7 +174,7 @@ static int strip_return_port (char *host) | ||
| 22 | { | ||
| 23 | char *ptr1; | ||
| 24 | char *ptr2; | ||
| 25 | - int port; | ||
| 26 | + unsigned port; | ||
| 27 | |||
| 28 | ptr1 = strrchr (host, ':'); | ||
| 29 | if (ptr1 == NULL) | ||
| 30 | @@ -186,8 +186,11 @@ static int strip_return_port (char *host) | ||
| 31 | return 0; | ||
| 32 | |||
| 33 | *ptr1++ = '\0'; | ||
| 34 | - if (sscanf (ptr1, "%d", &port) != 1) /* one conversion required */ | ||
| 35 | - return 0; | ||
| 36 | + | ||
| 37 | + port = atoi(ptr1); | ||
| 38 | + /* check that port string is in the valid range 1-0xffff) */ | ||
| 39 | + if(strlen(ptr1) > 5 || (port & 0xffff0000)) return 0; | ||
| 40 | + | ||
| 41 | return port; | ||
| 42 | } | ||
| 43 | |||
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.3.bb index 8558291c18..745c55bc0d 100644 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.3.bb | |||
| @@ -7,10 +7,9 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz | |||
| 7 | file://tinyproxy.service \ | 7 | file://tinyproxy.service \ |
| 8 | file://tinyproxy.conf \ | 8 | file://tinyproxy.conf \ |
| 9 | file://run-ptest \ | 9 | file://run-ptest \ |
| 10 | file://CVE-2025-63938.patch \ | ||
| 11 | " | 10 | " |
| 12 | 11 | ||
| 13 | SRC_URI[sha256sum] = "2c8fe5496f2c642bfd189020504ab98d74b9edbafcdb94d9f108e157b5bdf96d" | 12 | SRC_URI[sha256sum] = "9bcf46db1a2375ff3e3d27a41982f1efec4706cce8899ff9f33323a8218f7592" |
| 14 | 13 | ||
| 15 | UPSTREAM_CHECK_URI = "https://github.com/tinyproxy/tinyproxy/releases" | 14 | UPSTREAM_CHECK_URI = "https://github.com/tinyproxy/tinyproxy/releases" |
| 16 | 15 | ||
