diff options
author | Joe Slater <joe.slater@windriver.com> | 2018-07-12 11:48:17 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-30 00:02:52 +0100 |
commit | f259167b77acf899f7ed96f607600811e63356dc (patch) | |
tree | e6dba014e5fce4ec4cb3c8ab111e9c1daae73a50 /meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch | |
parent | 884b88356259dfc3ec464adb1a8c6dda2ac4cf42 (diff) | |
download | poky-f259167b77acf899f7ed96f607600811e63356dc.tar.gz |
tiff: security fix CVE-2018-10963
Denial of service described at https://nvd.nist.gov/vuln/detail/CVE-2018-10963.
(From OE-Core rev: d19a9b41d3b2dcba3b102a8289b7787b4b131e96)
(From OE-Core rev: d1327439b800e21a8116f8e33e4fe9d2b6c17198)
Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch')
-rw-r--r-- | meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch b/meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch new file mode 100644 index 0000000000..7252298b52 --- /dev/null +++ b/meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From de144fd228e4be8aa484c3caf3d814b6fa88c6d9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Even Rouault <even.rouault@spatialys.com> | ||
3 | Date: Sat, 12 May 2018 14:24:15 +0200 | ||
4 | Subject: [PATCH] TIFFWriteDirectorySec: avoid assertion. Fixes | ||
5 | http://bugzilla.maptools.org/show_bug.cgi?id=2795. | ||
6 | CVE-2018-10963 | ||
7 | |||
8 | --- | ||
9 | CVE: CVE-2018-10963 | ||
10 | |||
11 | Upstream-Status: Backport [gitlab.com/libtiff/libtiff/commit/de144f...] | ||
12 | |||
13 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
14 | |||
15 | --- | ||
16 | libtiff/tif_dirwrite.c | 7 +++++-- | ||
17 | 1 file changed, 5 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c | ||
20 | index 2430de6..c15a28d 100644 | ||
21 | --- a/libtiff/tif_dirwrite.c | ||
22 | +++ b/libtiff/tif_dirwrite.c | ||
23 | @@ -695,8 +695,11 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int imagedone, uint64* pdiroff) | ||
24 | } | ||
25 | break; | ||
26 | default: | ||
27 | - assert(0); /* we should never get here */ | ||
28 | - break; | ||
29 | + TIFFErrorExt(tif->tif_clientdata,module, | ||
30 | + "Cannot write tag %d (%s)", | ||
31 | + TIFFFieldTag(o), | ||
32 | + o->field_name ? o->field_name : "unknown"); | ||
33 | + goto bad; | ||
34 | } | ||
35 | } | ||
36 | } | ||
37 | -- | ||
38 | 1.7.9.5 | ||
39 | |||