mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
squid: patch CVE-2025-59362
Pick commit from PR mentioned in NVD report. Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
@@ -0,0 +1,52 @@
|
|||||||
|
From 0d89165ee6da10e6fa50c44998b3cd16d59400e9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alex Rousskov <rousskov@measurement-factory.com>
|
||||||
|
Date: Sat, 30 Aug 2025 06:49:36 +0000
|
||||||
|
Subject: [PATCH] Fix ASN.1 encoding of long SNMP OIDs (#2149)
|
||||||
|
|
||||||
|
CVE: CVE-2025-59362
|
||||||
|
Upstream-Status: Backport [https://github.com/squid-cache/squid/commit/0d89165ee6da10e6fa50c44998b3cd16d59400e9]
|
||||||
|
Signed-off-by: Peter Marko <peter.marko@siemens.com>
|
||||||
|
---
|
||||||
|
lib/snmplib/asn1.c | 13 +++++++++++++
|
||||||
|
1 file changed, 13 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/lib/snmplib/asn1.c b/lib/snmplib/asn1.c
|
||||||
|
index 81f2051fb..2852c26b2 100644
|
||||||
|
--- a/lib/snmplib/asn1.c
|
||||||
|
+++ b/lib/snmplib/asn1.c
|
||||||
|
@@ -735,6 +735,7 @@ asn_build_objid(u_char * data, int *datalength,
|
||||||
|
* lastbyte ::= 0 7bitvalue
|
||||||
|
*/
|
||||||
|
u_char buf[MAX_OID_LEN];
|
||||||
|
+ u_char *bufEnd = buf + sizeof(buf);
|
||||||
|
u_char *bp = buf;
|
||||||
|
oid *op = objid;
|
||||||
|
int asnlength;
|
||||||
|
@@ -753,6 +754,10 @@ asn_build_objid(u_char * data, int *datalength,
|
||||||
|
while (objidlength-- > 0) {
|
||||||
|
subid = *op++;
|
||||||
|
if (subid < 127) { /* off by one? */
|
||||||
|
+ if (bp >= bufEnd) {
|
||||||
|
+ snmp_set_api_error(SNMPERR_ASN_ENCODE);
|
||||||
|
+ return (NULL);
|
||||||
|
+ }
|
||||||
|
*bp++ = subid;
|
||||||
|
} else {
|
||||||
|
mask = 0x7F; /* handle subid == 0 case */
|
||||||
|
@@ -770,8 +775,16 @@ asn_build_objid(u_char * data, int *datalength,
|
||||||
|
/* fix a mask that got truncated above */
|
||||||
|
if (mask == 0x1E00000)
|
||||||
|
mask = 0xFE00000;
|
||||||
|
+ if (bp >= bufEnd) {
|
||||||
|
+ snmp_set_api_error(SNMPERR_ASN_ENCODE);
|
||||||
|
+ return (NULL);
|
||||||
|
+ }
|
||||||
|
*bp++ = (u_char) (((subid & mask) >> bits) | ASN_BIT8);
|
||||||
|
}
|
||||||
|
+ if (bp >= bufEnd) {
|
||||||
|
+ snmp_set_api_error(SNMPERR_ASN_ENCODE);
|
||||||
|
+ return (NULL);
|
||||||
|
+ }
|
||||||
|
*bp++ = (u_char) (subid & mask);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -21,6 +21,7 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.xz \
|
|||||||
file://0002-squid-make-squid-conf-tests-run-on-target-device.patch \
|
file://0002-squid-make-squid-conf-tests-run-on-target-device.patch \
|
||||||
file://squid.nm \
|
file://squid.nm \
|
||||||
file://CVE-2024-37894.patch \
|
file://CVE-2024-37894.patch \
|
||||||
|
file://CVE-2025-59362.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "1ad72d46e1cb556e9561214f0fb181adb87c7c47927ef69bc8acd68a03f61882"
|
SRC_URI[sha256sum] = "1ad72d46e1cb556e9561214f0fb181adb87c7c47927ef69bc8acd68a03f61882"
|
||||||
|
|||||||
Reference in New Issue
Block a user