diff options
author | Peter Marko <peter.marko@siemens.com> | 2025-09-25 16:05:13 +0200 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2025-09-25 12:25:52 -0700 |
commit | ac184e133bbb0e88d6aaf0584cff0304a036c562 (patch) | |
tree | ef8b0f19f0512cbdfd137ebfd34de386f5a30682 | |
parent | 73a25f197b117a5c8118d28043c350be930b5399 (diff) | |
download | poky-ac184e133bbb0e88d6aaf0584cff0304a036c562.tar.gz |
tiff: patch CVE-2025-9165
Pick commit mentioned in NVD report.
(From OE-Core rev: af4a1f0140fc7739b1bd6e39be1df28681628312)
Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/recipes-multimedia/libtiff/tiff/CVE-2025-9165.patch | 29 | ||||
-rw-r--r-- | meta/recipes-multimedia/libtiff/tiff_4.7.0.bb | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libtiff/tiff/CVE-2025-9165.patch b/meta/recipes-multimedia/libtiff/tiff/CVE-2025-9165.patch new file mode 100644 index 0000000000..560229284c --- /dev/null +++ b/meta/recipes-multimedia/libtiff/tiff/CVE-2025-9165.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From ed141286a37f6e5ddafb5069347ff5d587e7a4e0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Su_Laus <sulau@freenet.de> | ||
3 | Date: Fri, 8 Aug 2025 21:35:30 +0200 | ||
4 | Subject: [PATCH] tiffcmp: fix memory leak when second file cannot be opened. | ||
5 | |||
6 | Closes #728, #729 | ||
7 | |||
8 | CVE: CVE-2025-9165 | ||
9 | Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/ed141286a37f6e5ddafb5069347ff5d587e7a4e0] | ||
10 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
11 | --- | ||
12 | tools/tiffcmp.c | 3 +++ | ||
13 | 1 file changed, 3 insertions(+) | ||
14 | |||
15 | diff --git a/tools/tiffcmp.c b/tools/tiffcmp.c | ||
16 | index 529c1cdc..88d9470f 100644 | ||
17 | --- a/tools/tiffcmp.c | ||
18 | +++ b/tools/tiffcmp.c | ||
19 | @@ -105,7 +105,10 @@ int main(int argc, char *argv[]) | ||
20 | return (2); | ||
21 | tif2 = TIFFOpen(argv[optind + 1], "r"); | ||
22 | if (tif2 == NULL) | ||
23 | + { | ||
24 | + TIFFClose(tif1); | ||
25 | return (2); | ||
26 | + } | ||
27 | dirnum = 0; | ||
28 | while (tiffcmp(tif1, tif2)) | ||
29 | { | ||
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.7.0.bb b/meta/recipes-multimedia/libtiff/tiff_4.7.0.bb index fd383e3d6a..405edabe6f 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.7.0.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.7.0.bb | |||
@@ -17,6 +17,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ | |||
17 | file://CVE-2025-8177_1.patch \ | 17 | file://CVE-2025-8177_1.patch \ |
18 | file://CVE-2025-8177_2.patch \ | 18 | file://CVE-2025-8177_2.patch \ |
19 | file://CVE-2025-8534.patch \ | 19 | file://CVE-2025-8534.patch \ |
20 | file://CVE-2025-9165.patch \ | ||
20 | " | 21 | " |
21 | 22 | ||
22 | SRC_URI[sha256sum] = "67160e3457365ab96c5b3286a0903aa6e78bdc44c4bc737d2e486bcecb6ba976" | 23 | SRC_URI[sha256sum] = "67160e3457365ab96c5b3286a0903aa6e78bdc44c4bc737d2e486bcecb6ba976" |