diff options
author | Davide Gardenal <davidegarde2000@gmail.com> | 2022-05-13 11:58:01 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-20 10:08:06 +0100 |
commit | cf9a7e4cc66fc3813d4957ad68d2d40c15109af7 (patch) | |
tree | 05e13177459862ac18f13b235e05779fe4872e48 | |
parent | c27fdfb8510c5927e7a9df672665af58b8bfac19 (diff) | |
download | poky-cf9a7e4cc66fc3813d4957ad68d2d40c15109af7.tar.gz |
freetype: backport patch for CVE-2022-27406
CVE: CVE-2022-27406
Upstream issue:
https://gitlab.freedesktop.org/freetype/freetype/-/issues/1140
(From OE-Core rev: 2c1df19405e2f52b06feec0506ad56cef7d4c6c1)
Signed-off-by: Davide Gardenal <davide.gardenal@huawei.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/freetype/freetype/CVE-2022-27406.patch | 32 | ||||
-rw-r--r-- | meta/recipes-graphics/freetype/freetype_2.11.1.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-graphics/freetype/freetype/CVE-2022-27406.patch b/meta/recipes-graphics/freetype/freetype/CVE-2022-27406.patch new file mode 100644 index 0000000000..49f76c643f --- /dev/null +++ b/meta/recipes-graphics/freetype/freetype/CVE-2022-27406.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 0c2bdb01a2e1d24a3e592377a6d0822856e10df2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Werner Lemberg <wl@gnu.org> | ||
3 | Date: Sat, 19 Mar 2022 09:37:28 +0100 | ||
4 | Subject: [PATCH] * src/base/ftobjs.c (FT_Request_Size): Guard `face->size`. | ||
5 | |||
6 | Fixes #1140. | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | https://gitlab.freedesktop.org/freetype/freetype/-/commit/0c2bdb01a2e1d24a3e592377a6d0822856e10df2 | ||
10 | |||
11 | Signed-off-by: Davide Gardenal <davide.gardenal@huawei.com> | ||
12 | --- | ||
13 | src/base/ftobjs.c | 3 +++ | ||
14 | 1 file changed, 3 insertions(+) | ||
15 | |||
16 | diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c | ||
17 | index 6492a1517..282c9121a 100644 | ||
18 | --- a/src/base/ftobjs.c | ||
19 | +++ b/src/base/ftobjs.c | ||
20 | @@ -3409,6 +3409,9 @@ | ||
21 | if ( !face ) | ||
22 | return FT_THROW( Invalid_Face_Handle ); | ||
23 | |||
24 | + if ( !face->size ) | ||
25 | + return FT_THROW( Invalid_Size_Handle ); | ||
26 | + | ||
27 | if ( !req || req->width < 0 || req->height < 0 || | ||
28 | req->type >= FT_SIZE_REQUEST_TYPE_MAX ) | ||
29 | return FT_THROW( Invalid_Argument ); | ||
30 | -- | ||
31 | GitLab | ||
32 | |||
diff --git a/meta/recipes-graphics/freetype/freetype_2.11.1.bb b/meta/recipes-graphics/freetype/freetype_2.11.1.bb index 02a81a4f4f..5b464d3d70 100644 --- a/meta/recipes-graphics/freetype/freetype_2.11.1.bb +++ b/meta/recipes-graphics/freetype/freetype_2.11.1.bb | |||
@@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=a5927784d823d443c6cae55701d01553 \ | |||
15 | SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BP}.tar.xz \ | 15 | SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BP}.tar.xz \ |
16 | file://CVE-2022-27404.patch \ | 16 | file://CVE-2022-27404.patch \ |
17 | file://CVE-2022-27405.patch \ | 17 | file://CVE-2022-27405.patch \ |
18 | file://CVE-2022-27406.patch \ | ||
18 | " | 19 | " |
19 | SRC_URI[sha256sum] = "3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8" | 20 | SRC_URI[sha256sum] = "3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8" |
20 | 21 | ||