aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/libxml
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-09-17 10:22:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-17 14:13:04 +0100
commite6c60252ab4ba6842f63c6b8a519a85f2ff238fb (patch)
treea21c7e1e892f0d0e73643825b0b3337cf0bc4c35 /meta/recipes-core/libxml
parent106a4f5b41e5bdeabe588b9ba362f3693b1a9989 (diff)
downloadopenembedded-core-contrib-e6c60252ab4ba6842f63c6b8a519a85f2ff238fb.tar.gz
openembedded-core-contrib-e6c60252ab4ba6842f63c6b8a519a85f2ff238fb.tar.bz2
openembedded-core-contrib-e6c60252ab4ba6842f63c6b8a519a85f2ff238fb.zip
libxml2: remove patch for CVE-2012-2871
This CVE patch is actually against Chromium as they ship an internal fork of libxml2 and breaks ABI. The real issue has been resolved in libxslt 1.1.27, and we're shipping 1.1.28. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/libxml')
-rw-r--r--meta/recipes-core/libxml/libxml2/libxml2-CVE-2012-2871.patch34
-rw-r--r--meta/recipes-core/libxml/libxml2_2.9.1.bb4
2 files changed, 1 insertions, 37 deletions
diff --git a/meta/recipes-core/libxml/libxml2/libxml2-CVE-2012-2871.patch b/meta/recipes-core/libxml/libxml2/libxml2-CVE-2012-2871.patch
deleted file mode 100644
index 3c66a9ca5e1..00000000000
--- a/meta/recipes-core/libxml/libxml2/libxml2-CVE-2012-2871.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-libxml2 CVE-2012-2871
-
-the patch come from:
-http://src.chromium.org/viewvc/chrome/trunk/src/third_party/libxml/src \
-/include/libxml/tree.h?r1=56276&r2=149930
-
-libxml2 2.9.0-rc1 and earlier, as used in Google Chrome before 21.0.1180.89,
-does not properly support a cast of an unspecified variable during handling
-of XSL transforms, which allows remote attackers to cause a denial of service
-or possibly have unknown other impact via a crafted document, related to the
-_xmlNs data structure in include/libxml/tree.h.
-
-http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-2871
-
-Signed-off-by: Li Wang <li.wang@windriver.com>
----
- include/libxml/tree.h | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/include/libxml/tree.h b/include/libxml/tree.h
-index b733589..5422dda 100644
---- a/include/libxml/tree.h
-+++ b/include/libxml/tree.h
-@@ -351,6 +351,7 @@ struct _xmlNs {
- struct _xmlNs *next; /* next Ns link for this node */
- xmlNsType type; /* global or local */
- const xmlChar *href; /* URL for the namespace */
-+ const char *dummy_children; /* lines up with node->children */
- const xmlChar *prefix; /* prefix for the namespace */
- void *_private; /* application data */
- struct _xmlDoc *context; /* normally an xmlDoc */
---
-1.7.0.5
-
diff --git a/meta/recipes-core/libxml/libxml2_2.9.1.bb b/meta/recipes-core/libxml/libxml2_2.9.1.bb
index fa9c65752d6..0b6ac5d5c63 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.1.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.1.bb
@@ -1,8 +1,6 @@
require libxml2.inc
-SRC_URI += "file://libxml2-CVE-2012-2871.patch \
- http://www.w3.org/XML/Test/xmlts20080827.tar.gz;name=testtar \
- "
+SRC_URI += "http://www.w3.org/XML/Test/xmlts20080827.tar.gz;name=testtar"
SRC_URI[libtar.md5sum] = "9c0cfef285d5c4a5c80d00904ddab380"
SRC_URI[libtar.sha256sum] = "fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb"