diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-20 14:53:13 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-21 07:52:04 +0000 |
commit | e600227b136aa21b54f16e218858d640c8942f73 (patch) | |
tree | 03711207709ff46d4e068425b20df630a7be9f0c /meta/recipes-multimedia/libtiff/tiff/561599c99f987dc32ae110370cfdd7df7975586b.patch | |
parent | f625c01d91b80b6aca95afcc506a8b55f1c4f311 (diff) | |
download | poky-e600227b136aa21b54f16e218858d640c8942f73.tar.gz |
tiff: Add backports for two CVEs from upstream
(From OE-Core rev: 6ae14b4ff7a655b48c6d99ac565d12bf8825414f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/libtiff/tiff/561599c99f987dc32ae110370cfdd7df7975586b.patch')
-rw-r--r-- | meta/recipes-multimedia/libtiff/tiff/561599c99f987dc32ae110370cfdd7df7975586b.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libtiff/tiff/561599c99f987dc32ae110370cfdd7df7975586b.patch b/meta/recipes-multimedia/libtiff/tiff/561599c99f987dc32ae110370cfdd7df7975586b.patch new file mode 100644 index 0000000000..0b41dde606 --- /dev/null +++ b/meta/recipes-multimedia/libtiff/tiff/561599c99f987dc32ae110370cfdd7df7975586b.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 561599c99f987dc32ae110370cfdd7df7975586b Mon Sep 17 00:00:00 2001 | ||
2 | From: Even Rouault <even.rouault@spatialys.com> | ||
3 | Date: Sat, 5 Feb 2022 20:36:41 +0100 | ||
4 | Subject: [PATCH] TIFFReadDirectory(): avoid calling memcpy() with a null | ||
5 | source pointer and size of zero (fixes #362) | ||
6 | |||
7 | Upstream-Status: Backport | ||
8 | CVE: CVE-2022-0562 | ||
9 | |||
10 | --- | ||
11 | libtiff/tif_dirread.c | 3 ++- | ||
12 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c | ||
15 | index 2bbc4585..23194ced 100644 | ||
16 | --- a/libtiff/tif_dirread.c | ||
17 | +++ b/libtiff/tif_dirread.c | ||
18 | @@ -4177,7 +4177,8 @@ TIFFReadDirectory(TIFF* tif) | ||
19 | goto bad; | ||
20 | } | ||
21 | |||
22 | - memcpy(new_sampleinfo, tif->tif_dir.td_sampleinfo, old_extrasamples * sizeof(uint16_t)); | ||
23 | + if (old_extrasamples > 0) | ||
24 | + memcpy(new_sampleinfo, tif->tif_dir.td_sampleinfo, old_extrasamples * sizeof(uint16_t)); | ||
25 | _TIFFsetShortArray(&tif->tif_dir.td_sampleinfo, new_sampleinfo, tif->tif_dir.td_extrasamples); | ||
26 | _TIFFfree(new_sampleinfo); | ||
27 | } | ||
28 | -- | ||
29 | GitLab | ||
30 | |||