diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-06-06 14:01:16 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-07 21:21:54 +0100 |
commit | 570991487424397bf8374e77320820ce89493b3a (patch) | |
tree | 6370c28e8541f2dec687f9d8be24be98924f9d34 /meta/recipes-multimedia/libtiff/tiff/eecb0712f4c3a5b449f70c57988260a667ddbdef.patch | |
parent | 6196e496847e67d38462b9b40bba13b021caaf19 (diff) | |
download | poky-570991487424397bf8374e77320820ce89493b3a.tar.gz |
tiff: update 4.3.0 -> 4.4.0
Drop all CVE backports.
(From OE-Core rev: ec3897659a046e7e3f652cabd04e98bb56f1b261)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/libtiff/tiff/eecb0712f4c3a5b449f70c57988260a667ddbdef.patch')
-rw-r--r-- | meta/recipes-multimedia/libtiff/tiff/eecb0712f4c3a5b449f70c57988260a667ddbdef.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-multimedia/libtiff/tiff/eecb0712f4c3a5b449f70c57988260a667ddbdef.patch b/meta/recipes-multimedia/libtiff/tiff/eecb0712f4c3a5b449f70c57988260a667ddbdef.patch deleted file mode 100644 index 74f9649fdf..0000000000 --- a/meta/recipes-multimedia/libtiff/tiff/eecb0712f4c3a5b449f70c57988260a667ddbdef.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From eecb0712f4c3a5b449f70c57988260a667ddbdef Mon Sep 17 00:00:00 2001 | ||
2 | From: Even Rouault <even.rouault@spatialys.com> | ||
3 | Date: Sun, 6 Feb 2022 13:08:38 +0100 | ||
4 | Subject: [PATCH] TIFFFetchStripThing(): avoid calling memcpy() with a null | ||
5 | source pointer and size of zero (fixes #362) | ||
6 | |||
7 | Upstream-Status: Backport | ||
8 | CVE: CVE-2022-0561 | ||
9 | |||
10 | --- | ||
11 | libtiff/tif_dirread.c | 5 +++-- | ||
12 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c | ||
15 | index 23194ced..50ebf8ac 100644 | ||
16 | --- a/libtiff/tif_dirread.c | ||
17 | +++ b/libtiff/tif_dirread.c | ||
18 | @@ -5777,8 +5777,9 @@ TIFFFetchStripThing(TIFF* tif, TIFFDirEntry* dir, uint32_t nstrips, uint64_t** l | ||
19 | _TIFFfree(data); | ||
20 | return(0); | ||
21 | } | ||
22 | - _TIFFmemcpy(resizeddata,data, (uint32_t)dir->tdir_count * sizeof(uint64_t)); | ||
23 | - _TIFFmemset(resizeddata+(uint32_t)dir->tdir_count, 0, (nstrips - (uint32_t)dir->tdir_count) * sizeof(uint64_t)); | ||
24 | + if( dir->tdir_count ) | ||
25 | + _TIFFmemcpy(resizeddata,data, (uint32_t)dir->tdir_count * sizeof(uint64_t)); | ||
26 | + _TIFFmemset(resizeddata+(uint32_t)dir->tdir_count, 0, (nstrips - (uint32_t)dir->tdir_count) * sizeof(uint64_t)); | ||
27 | _TIFFfree(data); | ||
28 | data=resizeddata; | ||
29 | } | ||
30 | -- | ||
31 | GitLab | ||
32 | |||