mirror of
https://git.yoctoproject.org/poky
synced 2026-02-15 13:13:02 +01:00
36c444aafc
Upstream-Status: Backport from acbbeef9f5
(From OE-Core rev: f75ef5dc195490ef8223f9a16086243450141e61)
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
57 lines
1.6 KiB
Diff
57 lines
1.6 KiB
Diff
From acbbeef9f5dcdcc901c5f3fa14d583ef8cfd22f0 Mon Sep 17 00:00:00 2001
|
|
From: Nick Wellnhofer <wellnhofer@aevum.de>
|
|
Date: Tue, 27 May 2025 12:53:17 +0200
|
|
Subject: [PATCH] tree: Fix integer overflow in xmlBuildQName
|
|
|
|
This issue affects memory safety.
|
|
|
|
Fixes #926.
|
|
|
|
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/-/commit/acbbeef9f5dcdcc901c5f3fa14d583ef8cfd22f0]
|
|
CVE: CVE-2025-6021
|
|
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
|
|
---
|
|
tree.c | 12 +++++++++---
|
|
1 file changed, 9 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/tree.c b/tree.c
|
|
index 6e04dfb..cdf863c 100644
|
|
--- a/tree.c
|
|
+++ b/tree.c
|
|
@@ -50,6 +50,10 @@
|
|
#include "buf.h"
|
|
#include "save.h"
|
|
|
|
+#ifndef SIZE_MAX
|
|
+#define SIZE_MAX ((size_t) -1)
|
|
+#endif
|
|
+
|
|
int __xmlRegisterCallbacks = 0;
|
|
|
|
/************************************************************************
|
|
@@ -222,16 +226,18 @@ xmlGetParameterEntityFromDtd(const xmlDtd *dtd, const xmlChar *name) {
|
|
xmlChar *
|
|
xmlBuildQName(const xmlChar *ncname, const xmlChar *prefix,
|
|
xmlChar *memory, int len) {
|
|
- int lenn, lenp;
|
|
+ size_t lenn, lenp;
|
|
xmlChar *ret;
|
|
|
|
- if (ncname == NULL) return(NULL);
|
|
+ if ((ncname == NULL) || (len < 0)) return(NULL);
|
|
if (prefix == NULL) return((xmlChar *) ncname);
|
|
|
|
lenn = strlen((char *) ncname);
|
|
lenp = strlen((char *) prefix);
|
|
+ if (lenn >= SIZE_MAX - lenp - 1)
|
|
+ return(NULL);
|
|
|
|
- if ((memory == NULL) || (len < lenn + lenp + 2)) {
|
|
+ if ((memory == NULL) || ((size_t) len < lenn + lenp + 2)) {
|
|
ret = (xmlChar *) xmlMallocAtomic(lenn + lenp + 2);
|
|
if (ret == NULL) {
|
|
xmlTreeErrMemory("building QName");
|
|
--
|
|
2.49.0
|
|
|