diff options
author | Yogita Urade <yogita.urade@windriver.com> | 2023-09-15 07:34:48 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-20 08:57:26 +0100 |
commit | 1843db6ae3aa77aa1d4e68dd3b130c419df548f8 (patch) | |
tree | 2c51a72435a200eb00d8986cd6088b1885fb371d /meta/recipes-multimedia/libtiff | |
parent | b1650772a269f0c939662237bc3a1db953acf9f4 (diff) | |
download | poky-1843db6ae3aa77aa1d4e68dd3b130c419df548f8.tar.gz |
tiff: fix CVE-2023-40745
libtiff: integer overflow in tiffcp.c
References:
https://security-tracker.debian.org/tracker/CVE-2023-40745
https://gitlab.com/libtiff/libtiff/-/issues/591
https://bugzilla.redhat.com/show_bug.cgi?id=2235265
(From OE-Core rev: c3d4fbeb51278a04a6800c894c681733ad2259ca)
Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/libtiff')
-rw-r--r-- | meta/recipes-multimedia/libtiff/files/CVE-2023-40745.patch | 35 | ||||
-rw-r--r-- | meta/recipes-multimedia/libtiff/tiff_4.5.1.bb | 4 |
2 files changed, 38 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2023-40745.patch b/meta/recipes-multimedia/libtiff/files/CVE-2023-40745.patch new file mode 100644 index 0000000000..73f1f37bab --- /dev/null +++ b/meta/recipes-multimedia/libtiff/files/CVE-2023-40745.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 4fc16f649fa2875d5c388cf2edc295510a247ee5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Arie Haenel <arie.haenel@jct.ac.il> | ||
3 | Date: Thu, 14 Sep 2023 04:31:35 +0000 | ||
4 | Subject: [PATCH] tiffcp: fix memory corruption (overflow) on hostile images | ||
5 | (fixes #591) | ||
6 | |||
7 | CVE: CVE-2023-40745 | ||
8 | |||
9 | Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/4fc16f649fa2875d5c388cf2edc295510a247ee5] | ||
10 | |||
11 | Signed-off-by: Yogita Urade <yogita.urade@windriver.com> | ||
12 | --- | ||
13 | tools/tiffcp.c | 7 +++++++ | ||
14 | 1 file changed, 7 insertions(+) | ||
15 | |||
16 | diff --git a/tools/tiffcp.c b/tools/tiffcp.c | ||
17 | index 3b2d1dd..57fa6e8 100644 | ||
18 | --- a/tools/tiffcp.c | ||
19 | +++ b/tools/tiffcp.c | ||
20 | @@ -1754,6 +1754,13 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer) | ||
21 | "Width * Samples/Pixel)"); | ||
22 | return 0; | ||
23 | } | ||
24 | + | ||
25 | + if ( (imagew - tilew * spp) > INT_MAX ){ | ||
26 | + TIFFError(TIFFFileName(in), | ||
27 | + "Error, image raster scan line size is too large"); | ||
28 | + return 0; | ||
29 | + } | ||
30 | + | ||
31 | iskew = imagew - tilew * spp; | ||
32 | tilebuf = limitMalloc(tilesize); | ||
33 | if (tilebuf == 0) | ||
34 | -- | ||
35 | 2.35.5 | ||
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.5.1.bb b/meta/recipes-multimedia/libtiff/tiff_4.5.1.bb index 6171a538e5..d002e1b233 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.5.1.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.5.1.bb | |||
@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a3e32d664d6db1386b4689c8121531c3" | |||
8 | 8 | ||
9 | CVE_PRODUCT = "libtiff" | 9 | CVE_PRODUCT = "libtiff" |
10 | 10 | ||
11 | SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz" | 11 | SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ |
12 | file://CVE-2023-40745.patch \ | ||
13 | " | ||
12 | 14 | ||
13 | SRC_URI[sha256sum] = "d7f38b6788e4a8f5da7940c5ac9424f494d8a79eba53d555f4a507167dca5e2b" | 15 | SRC_URI[sha256sum] = "d7f38b6788e4a8f5da7940c5ac9424f494d8a79eba53d555f4a507167dca5e2b" |
14 | 16 | ||