diff options
author | Fan Xin <fan.xin@jp.fujitsu.com> | 2017-06-06 15:57:52 +0900 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-09 17:12:14 +0100 |
commit | 8c19ed047a3333c5dd38b0d459ea81bb218950af (patch) | |
tree | d2c8f04452bea388a3e71bbca4d1aaf466f23f1d /meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff | |
parent | 38c06ab45084904b28ed6588f147e6379cf8475c (diff) | |
download | poky-8c19ed047a3333c5dd38b0d459ea81bb218950af.tar.gz |
cairo: Fix CVE-2017-7475
CVE: CVE-2017-7475
Bug 100763 - Denial-of-Service Attack due to Logical Problem in Program
https://bugs.freedesktop.org/show_bug.cgi?id=100763
(From OE-Core rev: 03be750d9c5a090141a9d76f8ee30d5f696a8595)
Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
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/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff')
-rw-r--r-- | meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff b/meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff new file mode 100644 index 0000000000..7aaad2eedd --- /dev/null +++ b/meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff | |||
@@ -0,0 +1,22 @@ | |||
1 | Cairo: Fix Denial-of-Service Attack due to Logical Problem in Program | ||
2 | |||
3 | https://bugs.freedesktop.org/show_bug.cgi?id=100763 | ||
4 | |||
5 | CVE: CVE-2017-7475 | ||
6 | Upstream-Status: Submitted | ||
7 | |||
8 | Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> | ||
9 | |||
10 | Index: cairo-1.15.4/src/cairo-ft-font.c | ||
11 | =================================================================== | ||
12 | --- cairo-1.15.4.orig/src/cairo-ft-font.c | ||
13 | +++ cairo-1.15.4/src/cairo-ft-font.c | ||
14 | @@ -1149,7 +1149,7 @@ _get_bitmap_surface (FT_Bitmap *bi | ||
15 | width = bitmap->width; | ||
16 | height = bitmap->rows; | ||
17 | |||
18 | - if (width == 0 || height == 0) { | ||
19 | + if (width == 0 || height == 0 || bitmap->buffer == NULL) { | ||
20 | *surface = (cairo_image_surface_t *) | ||
21 | cairo_image_surface_create_for_data (NULL, format, 0, 0, 0); | ||
22 | return (*surface)->base.status; | ||