From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- .../libxslt/libxslt/fix-rvts-handling.patch | 80 ++++++++++++++++++++++ .../meta/recipes-support/libxslt/libxslt_1.1.32.bb | 5 +- 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 poky/meta/recipes-support/libxslt/libxslt/fix-rvts-handling.patch (limited to 'poky/meta/recipes-support/libxslt') diff --git a/poky/meta/recipes-support/libxslt/libxslt/fix-rvts-handling.patch b/poky/meta/recipes-support/libxslt/libxslt/fix-rvts-handling.patch new file mode 100644 index 000000000..ea3ae51e9 --- /dev/null +++ b/poky/meta/recipes-support/libxslt/libxslt/fix-rvts-handling.patch @@ -0,0 +1,80 @@ +libxslt-1.1.32: Fix handling of RVTs returned from nested EXSLT functions + +[No upstream tracking] -- https://bugzilla.gnome.org/show_bug.cgi?id=792580 + +Set the context variable to NULL when evaluating EXSLT functions. +Fixes potential use-after-free errors or memory leaks. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxslt/commit/8bd32f7753ac253a54279a0b6a88d15a57076bb0] +bug: 792580 +Signed-off-by: Andrej Valek + +diff --git a/libexslt/functions.c b/libexslt/functions.c +index dc794e3..8511cb0 100644 +--- a/libexslt/functions.c ++++ b/libexslt/functions.c +@@ -280,6 +280,7 @@ exsltFuncFunctionFunction (xmlXPathParserContextPtr ctxt, int nargs) { + exsltFuncFunctionData *func; + xmlNodePtr paramNode, oldInsert, fake; + int oldBase; ++ void *oldCtxtVar; + xsltStackElemPtr params = NULL, param; + xsltTransformContextPtr tctxt = xsltXPathGetTransformContext(ctxt); + int i, notSet; +@@ -418,11 +419,14 @@ exsltFuncFunctionFunction (xmlXPathParserContextPtr ctxt, int nargs) { + fake = xmlNewDocNode(tctxt->output, NULL, + (const xmlChar *)"fake", NULL); + oldInsert = tctxt->insert; ++ oldCtxtVar = tctxt->contextVariable; + tctxt->insert = fake; ++ tctxt->contextVariable = NULL; + xsltApplyOneTemplate (tctxt, tctxt->node, + func->content, NULL, NULL); + xsltLocalVariablePop(tctxt, tctxt->varsBase, -2); + tctxt->insert = oldInsert; ++ tctxt->contextVariable = oldCtxtVar; + tctxt->varsBase = oldBase; /* restore original scope */ + if (params != NULL) + xsltFreeStackElemList(params); +diff --git a/tests/docs/bug-209.xml b/tests/docs/bug-209.xml +new file mode 100644 +index 0000000..69d62f2 +--- /dev/null ++++ b/tests/docs/bug-209.xml +@@ -0,0 +1 @@ ++ +diff --git a/tests/general/bug-209.out b/tests/general/bug-209.out +new file mode 100644 +index 0000000..e829790 +--- /dev/null ++++ b/tests/general/bug-209.out +@@ -0,0 +1,2 @@ ++ ++ +diff --git a/tests/general/bug-209.xsl b/tests/general/bug-209.xsl +new file mode 100644 +index 0000000..fe69ac6 +--- /dev/null ++++ b/tests/general/bug-209.xsl +@@ -0,0 +1,21 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --git a/poky/meta/recipes-support/libxslt/libxslt_1.1.32.bb b/poky/meta/recipes-support/libxslt/libxslt_1.1.32.bb index 6a03f7769..f0fa5e723 100644 --- a/poky/meta/recipes-support/libxslt/libxslt_1.1.32.bb +++ b/poky/meta/recipes-support/libxslt/libxslt_1.1.32.bb @@ -8,7 +8,10 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458" SECTION = "libs" DEPENDS = "libxml2" -SRC_URI = "http://xmlsoft.org/sources/libxslt-${PV}.tar.gz" +SRC_URI = "http://xmlsoft.org/sources/libxslt-${PV}.tar.gz \ + file://fix-rvts-handling.patch \ + " + SRC_URI[md5sum] = "1fc72f98e98bf4443f1651165f3aa146" SRC_URI[sha256sum] = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460" -- cgit v1.2.3