-
Notifications
You must be signed in to change notification settings - Fork 602
[Medium] Patch libxml2 for CVE-2025-6021 #14081
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Medium] Patch libxml2 for CVE-2025-6021 #14081
Conversation
Signed-off-by: Sreenivasulu Malavathula <[email protected]>
SPECS/libxml2/CVE-2025-6021.patch
Outdated
| #endif | ||
|
|
||
| #define IN_LIBXML | ||
| +#include <stdint.h> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In upstream master, this macro is defined in 2 headers:
#include "private/memory.h": Refer commit
#include "private/io.h"
tree.c includes these headers. But the commits are not present in our sources and hence we see the error.
I would suggest we add similar definition in tree.c rather than importing a complete header file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The upstream master libxml2 version is 2,15.0 but our 2,0 branch libxml2 version is 2.10.4. The files mentioned above is not available like private/memory.h or private/io.h in our version. In our version tree,c file, is does not include 'private/*.h' header files, also does not exist.
-Thanks
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, updated the Patch file as you suggested.
Recompiled with new Patch file, compiled successfully.
Uploaded new 'screenshot' in "Test Methodology" PR Tag line.
-Thanks
|
Except for the header changes, the patches are in line with upstream changes |
|
Requesting to close this PR since an alternate PR - #14310 has been raised to resolve conflicts which are not solvable in this PR |
|
Closing based on the request. The fix will be continued in #14310 |
Merge Checklist
All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)
*-staticsubpackages, etc.) have had theirReleasetag incremented../cgmanifest.json,./toolkit/scripts/toolchain/cgmanifest.json,.github/workflows/cgmanifest.json)./LICENSES-AND-NOTICES/SPECS/data/licenses.json,./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md,./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)*.signatures.jsonfilessudo make go-tidy-allandsudo make go-test-coveragepassSummary
Summary
libxml2: Patch for CVE-2025-6021
Patch Modified: Yes
Astrolabe patch reference: https://gitlab.gnome.org/GNOME/libxml2/-/commit/ad346c9a249c4b380bf73c460ad3e81135c5d781
From Upstream patch, instead of including <stdinc.h> header file, added 'macro of SIZE_MAX' to our patch file if this macro NOT defined, that required to compile libxml2.
Change Log
Does this affect the toolchain?
YES
Associated issues
Links to CVEs
Test Methodology
CVE-2025-6021.patchis applied as shown below