From caa1d0308959800ef8d4b730bfbf31fa15593e62 Mon Sep 17 00:00:00 2001
From: Li Wang
Date: Thu, 13 Dec 2012 14:51:22 +0800
Subject: librsvg: CVE-2011-3146
Store node type separately in RsvgNode
commit 34c95743ca692ea0e44778e41a7c0a129363de84 upstream
The node name (formerly RsvgNode:type) cannot be used to infer
the sub-type of RsvgNode that we're dealing with, since for unknown
elements we put type = node-name. This lead to a (potentially exploitable)
crash e.g. when the element name started with "fe" which tricked
the old code into considering it as a RsvgFilterPrimitive.
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-3146
https://bugzilla.gnome.org/show_bug.cgi?id=658014
[YOCTO #3581]
[ CQID: WIND00376773 ]
Upstream-Status: Backport
(From OE-Core rev: 6d030fcb69221da073ce413049deb8447934bed5)
Signed-off-by: Li Wang
Signed-off-by: Saul Wold
Resolved merge conflicts with denzil branch.
Fixes denzil bug [YOCTO #3651].
Signed-off-by: Scott Garman
Signed-off-by: Richard Purdie
---
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'meta/recipes-gnome/librsvg/librsvg_2.32.1.bb')
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index 1e57647cb3..ed2630ee0e 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
@@ -9,13 +9,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
SECTION = "x11/utils"
DEPENDS = "gtk+ libcroco cairo libxml2 popt"
-PR = "r5"
+PR = "r6"
inherit autotools pkgconfig gnome
EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco --disable-gnome-vfs"
-SRC_URI += "file://doc_Makefile.patch"
+SRC_URI += "file://doc_Makefile.patch \
+ file://librsvg-CVE-2011-3146.patch \
+ "
SRC_URI[archive.md5sum] = "4b00d0fee130c936644892c152f42db7"
SRC_URI[archive.sha256sum] = "91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334"
--
cgit v1.2.3-54-g00ecf