diff options
author | Changqing Li <changqing.li@windriver.com> | 2021-09-05 10:54:18 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-10 16:21:36 +0100 |
commit | cf9e68db3165534e97a8ec8d9dc68482dc185fe0 (patch) | |
tree | 33ef750c5b3ecd63adfe320fbe003ece42d82ffd /meta | |
parent | 60cfe38b513d474714500d1f5fcf408139c6a146 (diff) | |
download | poky-cf9e68db3165534e97a8ec8d9dc68482dc185fe0.tar.gz |
gdk-pixbuf: fix CVE-2021-20240
Source: https://git.openembedded.org/openembedded-core
MR: 111543
Type: Security Fix
Disposition: Backport from https://git.openembedded.org/openembedded-core/commit/meta/recipes-gnome/gdk-pixbuf?h=hardknott&id=bd08e4d179979937604c196b4047f59c5499a960
ChangeID: bd08e4d179979937604c196b4047f59c5499a960
Description:
(From OE-Core rev: bd08e4d179979937604c196b4047f59c5499a960)
(From OE-Core rev: c7b6a3fef6aa04bb1d264326e483e8a3d3350ca2)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit de631334ccd2d6af74ed795228394ee2b7218403)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch | 40 | ||||
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch new file mode 100644 index 0000000000..fe594b24bb --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 086e8adf4cc352cd11572f96066b001b545f354e Mon Sep 17 00:00:00 2001 | ||
2 | From: Emmanuele Bassi <ebassi@gnome.org> | ||
3 | Date: Wed, 1 Apr 2020 18:11:55 +0100 | ||
4 | Subject: [PATCH] Check the memset length argument | ||
5 | |||
6 | Avoid overflows by using the checked multiplication macro for gsize. | ||
7 | |||
8 | Fixes: #132 | ||
9 | |||
10 | Upstream-Status: Backported [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/086e8adf4cc352cd11572f96066b001b545f354e] | ||
11 | CVE: CVE-2021-20240 | ||
12 | |||
13 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
14 | --- | ||
15 | gdk-pixbuf/io-gif-animation.c | 6 +++++- | ||
16 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/gdk-pixbuf/io-gif-animation.c b/gdk-pixbuf/io-gif-animation.c | ||
19 | index c9db3c66e..49674fd2e 100644 | ||
20 | --- a/gdk-pixbuf/io-gif-animation.c | ||
21 | +++ b/gdk-pixbuf/io-gif-animation.c | ||
22 | @@ -412,11 +412,15 @@ gdk_pixbuf_gif_anim_iter_get_pixbuf (GdkPixbufAnimationIter *anim_iter) | ||
23 | |||
24 | /* If no rendered frame, render the first frame */ | ||
25 | if (anim->last_frame == NULL) { | ||
26 | + gsize len = 0; | ||
27 | if (anim->last_frame_data == NULL) | ||
28 | anim->last_frame_data = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, anim->width, anim->height); | ||
29 | if (anim->last_frame_data == NULL) | ||
30 | return NULL; | ||
31 | - memset (gdk_pixbuf_get_pixels (anim->last_frame_data), 0, gdk_pixbuf_get_rowstride (anim->last_frame_data) * anim->height); | ||
32 | + if (g_size_checked_mul (&len, gdk_pixbuf_get_rowstride (anim->last_frame_data), anim->height)) | ||
33 | + memset (gdk_pixbuf_get_pixels (anim->last_frame_data), 0, len); | ||
34 | + else | ||
35 | + return NULL; | ||
36 | composite_frame (anim, g_list_nth_data (anim->frames, 0)); | ||
37 | } | ||
38 | |||
39 | -- | ||
40 | GitLab | ||
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb index 54861e83c6..60a04c3581 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb | |||
@@ -25,6 +25,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ | |||
25 | file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \ | 25 | file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \ |
26 | file://missing-test-data.patch \ | 26 | file://missing-test-data.patch \ |
27 | file://CVE-2020-29385.patch \ | 27 | file://CVE-2020-29385.patch \ |
28 | file://CVE-2021-20240.patch \ | ||
28 | " | 29 | " |
29 | 30 | ||
30 | SRC_URI_append_class-target = " \ | 31 | SRC_URI_append_class-target = " \ |