diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch | 19 | ||||
-rw-r--r-- | meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch | 20 | ||||
-rw-r--r-- | meta/recipes-graphics/cairo/cairo_1.14.12.bb | 2 |
3 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch b/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch new file mode 100644 index 0000000000..5232cf70c6 --- /dev/null +++ b/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | There is a potential infinite-loop in function _arc_error_normalized(). | ||
2 | |||
3 | CVE: CVE-2019-6461 | ||
4 | Upstream-Status: Pending | ||
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
6 | |||
7 | diff --git a/src/cairo-arc.c b/src/cairo-arc.c | ||
8 | index 390397bae..f9249dbeb 100644 | ||
9 | --- a/src/cairo-arc.c | ||
10 | +++ b/src/cairo-arc.c | ||
11 | @@ -99,7 +99,7 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) | ||
12 | do { | ||
13 | angle = M_PI / i++; | ||
14 | error = _arc_error_normalized (angle); | ||
15 | - } while (error > tolerance); | ||
16 | + } while (error > tolerance && error > __DBL_EPSILON__); | ||
17 | |||
18 | return angle; | ||
19 | } | ||
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 @@ | |||
1 | There is an assertion in function _cairo_arc_in_direction(). | ||
2 | |||
3 | CVE: CVE-2019-6462 | ||
4 | Upstream-Status: Pending | ||
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
6 | |||
7 | diff --git a/src/cairo-arc.c b/src/cairo-arc.c | ||
8 | index 390397bae..1bde774a4 100644 | ||
9 | --- a/src/cairo-arc.c | ||
10 | +++ b/src/cairo-arc.c | ||
11 | @@ -186,7 +186,8 @@ _cairo_arc_in_direction (cairo_t *cr, | ||
12 | if (cairo_status (cr)) | ||
13 | return; | ||
14 | |||
15 | - assert (angle_max >= angle_min); | ||
16 | + if (angle_max < angle_min) | ||
17 | + return; | ||
18 | |||
19 | if (angle_max - angle_min > 2 * M_PI * MAX_FULL_CIRCLES) { | ||
20 | angle_max = fmod (angle_max - angle_min, 2 * M_PI); | ||
diff --git a/meta/recipes-graphics/cairo/cairo_1.14.12.bb b/meta/recipes-graphics/cairo/cairo_1.14.12.bb index 18b947948a..08026c462d 100644 --- a/meta/recipes-graphics/cairo/cairo_1.14.12.bb +++ b/meta/recipes-graphics/cairo/cairo_1.14.12.bb | |||
@@ -25,6 +25,8 @@ DEPENDS = "fontconfig glib-2.0 libpng pixman zlib" | |||
25 | SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \ | 25 | SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \ |
26 | file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \ | 26 | file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \ |
27 | file://0001-cairo-Fix-CVE-2017-9814.patch \ | 27 | file://0001-cairo-Fix-CVE-2017-9814.patch \ |
28 | file://CVE-2019-6461.patch \ | ||
29 | file://CVE-2019-6462.patch \ | ||
28 | " | 30 | " |
29 | 31 | ||
30 | SRC_URI[md5sum] = "9f0db9dbfca0966be8acd682e636d165" | 32 | SRC_URI[md5sum] = "9f0db9dbfca0966be8acd682e636d165" |