diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2022-08-22 23:46:06 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2022-08-22 23:46:57 +0300 |
| commit | 53fdac2b0aee16e297ce86b473c56547ff1330ac (patch) | |
| tree | 2bee75c38a2f8a1c8e1ff5d629a0defab197113f /meta-openembedded/meta-python/recipes-devtools/python/python3-lxml | |
| parent | cb2a94c39eddda6e0df65f98fff97cce711c9134 (diff) | |
| download | openbmc-53fdac2b0aee16e297ce86b473c56547ff1330ac.tar.xz | |
subtree updates
poky: e4b5c35fd4..387ab5f18b:
Alex Kiernan (2):
bind: Remove legacy python3 PACKAGECONFIG code
openssh: Add openssh-sftp-server to openssh RDEPENDS
Alexander Kanavin (16):
gnupg: update 2.3.4 -> 2.3.6
xev: update 1.2.4 -> 1.2.5
xmodmap: update 1.0.10 -> 1.0.11
xf86-input-synaptics: update 1.9.1 -> 1.9.2
encodings: update 1.0.5 -> 1.0.6
font-util: update 1.3.2 -> 1.3.3
xserver-xorg: update 21.1.3 -> 21.1.4
linux-firmware: update 20220610 -> 20220708
libuv: upgrade 1.44.1 -> 1.44.2
log4cplus: upgrade 2.0.7 -> 2.0.8
vala: upgrade 0.56.0 -> 0.56.1
vala: upgrade 0.56.1 -> 0.56.2
webkitgtk: upgrade 2.36.3 -> 2.36.4
xwayland: upgrade 22.1.2 -> 22.1.3
epiphany: upgrade 42.2 -> 42.3
lttng-modules: update 2.13.3 -> 2.13.4
Bruce Ashfield (14):
yocto-bsps: update to v5.10.113
yocto-bsps: update to v5.10.128 and buildpaths fixes
yocto-bsps: update to v5.15.52 and buildpaths fixes
yocto-bsps/5.10: fix buildpaths issue with gen-mach-types
yocto-bsps/5.15: fix buildpaths issue with gen-mach-types
yocto-bsps/5.10: fix buildpaths issue with pnmtologo
yocto-bsps/5.15: fix buildpaths issue with pnmtologo
yocto-bsps: update to v5.15.54
yocto-bsps: update to v5.10.130
linux-yocto/5.10: update to v5.10.135
linux-yocto/5.15: update to v5.15.58
linux-yocto-rt/5.15: update to -rt48 (and fix -stable merge)
linux-yocto/5.15: update to v5.15.59
linux-yocto/5.15: fix reproducibility issues
Dmitry Baryshkov (1):
linux-firwmare: restore WHENCE_CHKSUM variable
He Zhe (1):
lttng-modules: Fix build failure for kernel v5.15.58
Hitendra Prajapati (2):
qemu: CVE-2022-35414 can perform an uninitialized read on the translate_fail path, leading to an io_readx or io_writex crash
libtirpc: CVE-2021-46828 DoS vulnerability with lots of connections
Joshua Watt (1):
sstatesig: Include all dependencies in SPDX task signatures
Khem Raj (3):
lua: Backport fix for CVE-2022-33099
gcc-runtime: Pass -nostartfiles when building dummy libstdc++.so
libgcc: Fix standalone target builds with usrmerge distro feature
Martin Jansa (2):
kernel.bbclass: pass LD also in savedefconfig
glibc: revert one upstream change to work around broken DEBUG_BUILD build
Mihai Lindner (1):
wic/plugins/rootfs: Fix NameError for 'orig_path'
Ming Liu (2):
rootfs-postcommands.bbclass: move host-user-contaminated.txt to ${S}
udev-extraconf:mount.sh: fix a umount issue
Mingli Yu (1):
strace: set COMPATIBLE_HOST for riscv32
Naveen (1):
gcc: Backport a fix for gcc bug 105039
Richard Purdie (5):
vim: Upgrade 9.0.0021 -> 9.0.0063
xorg-app: Tweak handling of compression changes in SRC_URI
xwayland: upgrade 22.1.1 -> 22.1.2
base/reproducible: Change Source Date Epoch generation methods
build-appliance-image: Update to kirkstone head revision
Ross Burton (2):
oeqa/runtime: add test that the kernel has CONFIG_PREEMPT_RT enabled
perf: fix reproduciblity in older releases of Linux
Sakib Sajal (3):
dpkg: fix CVE-2022-1664
go: update v1.17.10 -> v1.17.12
git: upgrade v2.35.3 -> v2.35.4
Shruthi Ravichandran (2):
initscripts: run umountnfs as a KILL script
package_manager/ipk: do not pipe stderr to stdout
Steve Sakoman (1):
poky.conf: bump version for 4.0.3
Sundeep KOKKONDA (2):
binutils: stable 2.38 branch updates
glibc : stable 2.35 branch updates
Tom Hochstein (1):
gobject-introspection-data: Disable cache for g-ir-scanner
Yi Zhao (1):
tiff: Security fixes CVE-2022-1354 and CVE-2022-1355
Yue Tao (1):
gnupg: upgrade to 2.3.7 to fix CVE-2022-34903
gr embeter (1):
efivar: fix import functionality
leimaohui (1):
systemd: Added base_bindir into pkg_postinst:udev-hwdb.
wangmy (4):
bind: upgrade 9.18.2 -> 9.18.3
bind: upgrade 9.18.3 -> 9.18.4
mkfontscale: upgrade 1.2.1 -> 1.2.2
xdpyinfo: upgrade 1.3.2 -> 1.3.3
meta-openembedded: a47ef04661..acbe748798:
Akash Hadke (1):
polkit: Add --shell /bin/nologin to polkitd user
Anuj Mittal (1):
yasm: fix buildpaths warning
Armin Kuster (1):
bigbuckbunny-1080p: update SRC_URI
Aryaman Gupta (1):
rsyslog: update 8.2202->8.2206
Chen Qi (1):
catfish: fix buildpaths issue
Davide Gardenal (6):
libplist: ignore patched CVEs
meta-oe: ignore patched CVEs
mongodb: ignore unrelated CVEs
php: ignore patched CVEs
postgresql: ignore unrelated CVE
openjpeg: ignore CVE-2015-1239
Khem Raj (1):
ibus: Swith to use main branch instead of master
Marta Rybczynska (1):
polkit: update patches for musl compilation
Martin Jansa (1):
glmark2: fix compatibility with python-3.11
Mingli Yu (6):
net-snmp: set ac_cv_path_PSPROG
postgresql: Fix the buildpaths issue
freeradius: Fix buildpaths issue
openipmi: Fix buildpaths issue
apache2: Fix the buildpaths issue
frr: fix buildpaths issue
Peter Kjellerstedt (2):
libwebsockets: Avoid absolute paths in *.cmake files in the sysroot
cryptsetup: Add support for building without SSH tokens
Vyacheslav Yurkov (1):
polkit: add udisks2 rule
Wang Mingyu (3):
php: upgrade 8.1.7 -> 8.1.8
ndisc6: upgrade 1.0.5 -> 1.0.6
tracker: upgrade 3.3.0 -> 3.3.1
Yi Zhao (1):
polkit-group-rule-udisks2: fix override syntax in RDEPENDS
Yue Tao (1):
python3-lxml: Security fix CVE-2022-2309
wangmy (4):
stunnel: upgrade 5.63 -> 5.64
stunnel: upgrade 5.64 -> 5.65
redis: upgrade 7.0.2 -> 7.0.4
tracker: upgrade 3.3.1 -> 3.3.2
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I48e5e47f05b456589a0c3106b5a095f1b43780b0
Diffstat (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python3-lxml')
| -rw-r--r-- | meta-openembedded/meta-python/recipes-devtools/python/python3-lxml/CVE-2022-2309.patch | 99 |
1 files changed, 99 insertions, 0 deletions
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml/CVE-2022-2309.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml/CVE-2022-2309.patch new file mode 100644 index 0000000000..5ec55dfd2a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml/CVE-2022-2309.patch @@ -0,0 +1,99 @@ +From 86368e9cf70a0ad23cccd5ee32de847149af0c6f Mon Sep 17 00:00:00 2001 +From: Stefan Behnel <stefan_ml@behnel.de> +Date: Fri, 1 Jul 2022 21:06:10 +0200 +Subject: [PATCH] Fix a crash when incorrect parser input occurs together with + usages of iterwalk() on trees generated by the same parser. + +CVE: CVE-2022-2309 + +Upstream-Status: Backport +[https://github.com/lxml/lxml/commit/86368e9cf70a0ad23cccd5ee32de847149af0c6f] + +Signed-off-by: Yue Tao <yue.tao@windriver.com> + +--- + src/lxml/apihelpers.pxi | 7 ++++--- + src/lxml/iterparse.pxi | 11 ++++++----- + src/lxml/tests/test_etree.py | 20 ++++++++++++++++++++ + 3 files changed, 30 insertions(+), 8 deletions(-) + +diff --git a/src/lxml/apihelpers.pxi b/src/lxml/apihelpers.pxi +index c1662762..9fae9fb1 100644 +--- a/src/lxml/apihelpers.pxi ++++ b/src/lxml/apihelpers.pxi +@@ -246,9 +246,10 @@ cdef dict _build_nsmap(xmlNode* c_node): + while c_node is not NULL and c_node.type == tree.XML_ELEMENT_NODE: + c_ns = c_node.nsDef + while c_ns is not NULL: +- prefix = funicodeOrNone(c_ns.prefix) +- if prefix not in nsmap: +- nsmap[prefix] = funicodeOrNone(c_ns.href) ++ if c_ns.prefix or c_ns.href: ++ prefix = funicodeOrNone(c_ns.prefix) ++ if prefix not in nsmap: ++ nsmap[prefix] = funicodeOrNone(c_ns.href) + c_ns = c_ns.next + c_node = c_node.parent + return nsmap +diff --git a/src/lxml/iterparse.pxi b/src/lxml/iterparse.pxi +index 138c23a6..a7299da6 100644 +--- a/src/lxml/iterparse.pxi ++++ b/src/lxml/iterparse.pxi +@@ -420,7 +420,7 @@ cdef int _countNsDefs(xmlNode* c_node): + count = 0 + c_ns = c_node.nsDef + while c_ns is not NULL: +- count += 1 ++ count += (c_ns.href is not NULL) + c_ns = c_ns.next + return count + +@@ -431,9 +431,10 @@ cdef int _appendStartNsEvents(xmlNode* c_node, list event_list) except -1: + count = 0 + c_ns = c_node.nsDef + while c_ns is not NULL: +- ns_tuple = (funicode(c_ns.prefix) if c_ns.prefix is not NULL else '', +- funicode(c_ns.href)) +- event_list.append( (u"start-ns", ns_tuple) ) +- count += 1 ++ if c_ns.href: ++ ns_tuple = (funicodeOrEmpty(c_ns.prefix), ++ funicode(c_ns.href)) ++ event_list.append( (u"start-ns", ns_tuple) ) ++ count += 1 + c_ns = c_ns.next + return count +diff --git a/src/lxml/tests/test_etree.py b/src/lxml/tests/test_etree.py +index e5f08469..285313f6 100644 +--- a/src/lxml/tests/test_etree.py ++++ b/src/lxml/tests/test_etree.py +@@ -1460,6 +1460,26 @@ class ETreeOnlyTestCase(HelperTestCase): + [1,2,1,4], + counts) + ++ def test_walk_after_parse_failure(self): ++ # This used to be an issue because libxml2 can leak empty namespaces ++ # between failed parser runs. iterwalk() failed to handle such a tree. ++ try: ++ etree.XML('''<anot xmlns="1">''') ++ except etree.XMLSyntaxError: ++ pass ++ else: ++ assert False, "invalid input did not fail to parse" ++ ++ et = etree.XML('''<root> </root>''') ++ try: ++ ns = next(etree.iterwalk(et, events=('start-ns',))) ++ except StopIteration: ++ # This would be the expected result, because there was no namespace ++ pass ++ else: ++ # This is a bug in libxml2 ++ assert not ns, repr(ns) ++ + def test_itertext_comment_pi(self): + # https://bugs.launchpad.net/lxml/+bug/1844674 + XML = self.etree.XML +-- +2.17.1 + |
