diff options
author | Vijay Anusuri <vanusuri@mvista.com> | 2024-01-17 08:08:35 +0530 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2024-01-21 08:33:19 -1000 |
commit | d9d1a730aee831120e99a3250dd4e91f435b0b40 (patch) | |
tree | 0f778c04c30446b5c6c64e206ec9ff4e418c6b9c | |
parent | 854aafaea449e5808c0cc2ddf02088511cd3defb (diff) | |
download | poky-d9d1a730aee831120e99a3250dd4e91f435b0b40.tar.gz |
libtiff: Fix for CVE-2023-6228
Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/1e7d217a323eac701b134afc4ae39b6bdfdbc96a]
(From OE-Core rev: ff66998ef81dbc35465e30eec96ee9be51f5da80)
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/recipes-multimedia/libtiff/files/CVE-2023-6228.patch | 30 | ||||
-rw-r--r-- | meta/recipes-multimedia/libtiff/tiff_4.1.0.bb | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2023-6228.patch b/meta/recipes-multimedia/libtiff/files/CVE-2023-6228.patch new file mode 100644 index 0000000000..a777dea9b0 --- /dev/null +++ b/meta/recipes-multimedia/libtiff/files/CVE-2023-6228.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 1e7d217a323eac701b134afc4ae39b6bdfdbc96a Mon Sep 17 00:00:00 2001 | ||
2 | From: Su_Laus <sulau@freenet.de> | ||
3 | Date: Sat, 9 Sep 2023 15:45:47 +0200 | ||
4 | Subject: [PATCH] Check also if codec of input image is available, | ||
5 | independently from codec check of output image and return with error if not. | ||
6 | Fixes #606. | ||
7 | |||
8 | Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/1e7d217a323eac701b134afc4ae39b6bdfdbc96a] | ||
9 | CVE: CVE-2023-6228 | ||
10 | Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> | ||
11 | --- | ||
12 | tools/tiffcp.c | 2 ++ | ||
13 | 1 file changed, 2 insertions(+) | ||
14 | |||
15 | diff --git a/tools/tiffcp.c b/tools/tiffcp.c | ||
16 | index 007bd05..d2f7b66 100644 | ||
17 | --- a/tools/tiffcp.c | ||
18 | +++ b/tools/tiffcp.c | ||
19 | @@ -628,6 +628,8 @@ tiffcp(TIFF* in, TIFF* out) | ||
20 | else | ||
21 | CopyField(TIFFTAG_COMPRESSION, compression); | ||
22 | TIFFGetFieldDefaulted(in, TIFFTAG_COMPRESSION, &input_compression); | ||
23 | + if (!TIFFIsCODECConfigured(input_compression)) | ||
24 | + return FALSE; | ||
25 | TIFFGetFieldDefaulted(in, TIFFTAG_PHOTOMETRIC, &input_photometric); | ||
26 | if (input_compression == COMPRESSION_JPEG) { | ||
27 | /* Force conversion to RGB */ | ||
28 | -- | ||
29 | 2.25.1 | ||
30 | |||
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.1.0.bb b/meta/recipes-multimedia/libtiff/tiff_4.1.0.bb index 8b130826e3..c739f3a7fa 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.1.0.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.1.0.bb | |||
@@ -48,6 +48,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ | |||
48 | file://CVE-2023-40745.patch \ | 48 | file://CVE-2023-40745.patch \ |
49 | file://CVE-2023-41175.patch \ | 49 | file://CVE-2023-41175.patch \ |
50 | file://CVE-2022-40090.patch \ | 50 | file://CVE-2022-40090.patch \ |
51 | file://CVE-2023-6228.patch \ | ||
51 | " | 52 | " |
52 | SRC_URI[md5sum] = "2165e7aba557463acc0664e71a3ed424" | 53 | SRC_URI[md5sum] = "2165e7aba557463acc0664e71a3ed424" |
53 | SRC_URI[sha256sum] = "5d29f32517dadb6dbcd1255ea5bbc93a2b54b94fbf83653b4d65c7d6775b8634" | 54 | SRC_URI[sha256sum] = "5d29f32517dadb6dbcd1255ea5bbc93a2b54b94fbf83653b4d65c7d6775b8634" |