Patchwork libxml2: remove patch for CVE-2012-2871

login
register
mail settings
Submitter Ross Burton
Date Sept. 17, 2013, 9:22 a.m.
Message ID <1379409738-18923-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/58237/
State Accepted
Commit 06078af4cabefcd3a861821bd2f72b524a99c114
Headers show

Comments

Ross Burton - Sept. 17, 2013, 9:22 a.m.
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>
---
 .../libxml/libxml2/libxml2-CVE-2012-2871.patch     |   34 --------------------
 meta/recipes-core/libxml/libxml2_2.9.1.bb          |    4 +--
 2 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 meta/recipes-core/libxml/libxml2/libxml2-CVE-2012-2871.patch

Patch

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 3c66a9c..0000000
--- 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 fa9c657..0b6ac5d 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"