diff --git a/expat-CVE-2022-43680.patch b/expat-CVE-2022-43680.patch new file mode 100644 index 0000000000000000000000000000000000000000..e5e42dd3ddea5cc4b41edf212174dbb56a828d08 --- /dev/null +++ b/expat-CVE-2022-43680.patch @@ -0,0 +1,17 @@ +--- firefox-79.0/parser/expat/lib/xmlparse.c.cve-2022-43680 2022-11-18 10:00:58.441551281 +0800 ++++ firefox-79.0/parser/expat/lib/xmlparse.c 2022-11-18 10:05:30.523029488 +0800 +@@ -1004,6 +1004,14 @@ parserCreate(const XML_Char *encodingNam + parserInit(parser, encodingName); + + if (encodingName && !protocolEncodingName) { ++ if (dtd) { ++ // We need to stop the upcoming call to XML_ParserFree from happily ++ // destroying parser->m_dtd because the DTD is shared with the parent ++ // parser and the only guard that keeps XML_ParserFree from destroying ++ // parser->m_dtd is parser->m_isParamEntity but it will be set to ++ // XML_TRUE only later in XML_ExternalEntityParserCreate (or not at all). ++ parser->m_dtd = NULL; ++ } + XML_ParserFree(parser); + return NULL; + } diff --git a/firefox.spec b/firefox.spec index a93a4fd8eb71b3e0e1d1aee174c9d11fed0b7e6b..8ac6bb0251095d9c335b49cd2c4ccdcedc361256 100644 --- a/firefox.spec +++ b/firefox.spec @@ -88,7 +88,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 79.0 -Release: 13 +Release: 14 URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz @@ -195,6 +195,7 @@ Patch647: expat-CVE-2022-25236.patch Patch648: expat-CVE-2022-25315.patch # https://github.com/libexpat/libexpat/pull/629 Patch649: expat-CVE-2022-40674.patch +Patch650: expat-CVE-2022-43680.patch %if %{?system_nss} @@ -380,6 +381,7 @@ tar -xf %{SOURCE3} %patch647 -p1 %patch648 -p1 %patch649 -p1 +%patch650 -p1 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -822,6 +824,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Fri Jan 13 2023 jiangpeng - 79.0-14 +- fix CVE-2022-43680 + * Thu Oct 20 2022 wangkai - 79.0-13 - Fix for expat CVE-2022-40674