fix CVE-2024-34459

This commit is contained in:
cenhuilin 2024-05-14 10:42:26 +08:00
parent 3c53f29772
commit e61c08dc4b
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,26 @@
From 2876ac5392a4e891b81e40e592c3ac6cb46016ce Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Tue, 14 May 2024 08:50:50 +0800
Subject: [PATCH] [CVE-2024-34459] Fix buffer overread with `xmllint --htmlout`
Add a missing bounds check.
---
xmllint.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xmllint.c b/xmllint.c
index 72839b5..739ac47 100644
--- a/xmllint.c
+++ b/xmllint.c
@@ -595,7 +595,7 @@ xmlHTMLPrintFileContext(xmlParserInputPtr input) {
len = strlen(buffer);
snprintf(&buffer[len], sizeof(buffer) - len, "\n");
cur = input->cur;
- while ((*cur == '\n') || (*cur == '\r'))
+ while ((cur > base) && ((*cur == '\n') || (*cur == '\r')))
cur--;
n = 0;
while ((cur != base) && (n++ < 80)) {
--
2.33.0

View File

@ -1,7 +1,7 @@
Summary: Library providing XML and HTML support
Name: libxml2
Version: 2.9.10
Release: 40
Release: 41
License: MIT
Group: Development/Libraries
Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
@ -136,6 +136,7 @@ Patch123:backport-malloc-fail-Fix-memory-leak-in-xmlStaticCopyNodeList.patch
Patch124:backport-CVE-2023-45322.patch
Patch125:backport-CVE-2024-25062.patch
Patch126:backport-CVE-2022-2309.patch
Patch127:backport-CVE-2024-34459.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: python2-devel
@ -327,6 +328,12 @@ rm -fr %{buildroot}
%changelog
* Tue May 14 2024 cenhuilin <cenhuilin@kylinos.cn> - 2.9.10-41
- Type:CVE
- CVE:CVE-2024-34459
- SUG:NA
- DESC:fix CVE-2024-34459
* Tue Mar 26 zhuofeng <zhuofeng2@huawei.com> - 2.9.10-40
- Type:CVE
- CVE:CVE-2022-2309