summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-03-05 23:38:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-06 10:39:19 +0000
commit078e4d5c2114d942806cd0d5ad501805a011e841 (patch)
tree152f0f5cb9e0a9d191105b0b25da5f9771959412 /meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch
parenta4c89902a24c0961657c8281425d480097aadfa6 (diff)
downloadopenembedded-core-contrib-078e4d5c2114d942806cd0d5ad501805a011e841.tar.gz
cairo: fix CVE-2018-19876 CVE-2019-6461 CVE-2019-6462
CVE-2018-19876 is a backport from upstream. CVE-2019-6461 and CVE-2019-6462 are patches taken from Clear Linux. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch')
-rw-r--r--meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch b/meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch
new file mode 100644
index 0000000000..4e4598c5b5
--- /dev/null
+++ b/meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch
@@ -0,0 +1,20 @@
+There is an assertion in function _cairo_arc_in_direction().
+
+CVE: CVE-2019-6462
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+diff --git a/src/cairo-arc.c b/src/cairo-arc.c
+index 390397bae..1bde774a4 100644
+--- a/src/cairo-arc.c
++++ b/src/cairo-arc.c
+@@ -186,7 +186,8 @@ _cairo_arc_in_direction (cairo_t *cr,
+ if (cairo_status (cr))
+ return;
+
+- assert (angle_max >= angle_min);
++ if (angle_max < angle_min)
++ return;
+
+ if (angle_max - angle_min > 2 * M_PI * MAX_FULL_CIRCLES) {
+ angle_max = fmod (angle_max - angle_min, 2 * M_PI);