gdk-pixbuf: fix CVE-2021-20240
PATCH 1/1 gdk-pixbuf: fix CVE-2021-20240
From: Changqing Li <[email protected]>
--- .../gdk-pixbuf/CVE-2021-20240.patch | 40 +++++++++++++++++++ .../gdk-pixbuf/gdk-pixbuf_2.40.0.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch new file +40 -0
@@ -0,0 +1,40 @@ +From 086e8adf4cc352cd11572f96066b001b545f354e Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi <[email protected]> +Date: Wed, 1 Apr 2020 18:11:55 +0100 +Subject: [PATCH] Check the memset length argument + +Avoid overflows by using the checked multiplication macro for gsize. + +Fixes: #132 + +Upstream-Status: Backported [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/086e8adf4cc352cd11572f96066b001b545f354e] +CVE: CVE-2021-20240 + +Signed-off-by: Changqing Li <[email protected]> +--- + gdk-pixbuf/io-gif-animation.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/gdk-pixbuf/io-gif-animation.c b/gdk-pixbuf/io-gif-animation.c +index c9db3c66e..49674fd2e 100644 +--- a/gdk-pixbuf/io-gif-animation.c ++++ b/gdk-pixbuf/io-gif-animation.c +@@ -412,11 +412,15 @@ gdk_pixbuf_gif_anim_iter_get_pixbuf (GdkPixbufAnimationIter *anim_iter) + + /* If no rendered frame, render the first frame */ + if (anim->last_frame == NULL) { ++ gsize len = 0; + if (anim->last_frame_data == NULL) + anim->last_frame_data = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, anim->width, anim->height); + if (anim->last_frame_data == NULL) + return NULL; +- memset (gdk_pixbuf_get_pixels (anim->last_frame_data), 0, gdk_pixbuf_get_rowstride (anim->last_frame_data) * anim->height); ++ if (g_size_checked_mul (&len, gdk_pixbuf_get_rowstride (anim->last_frame_data), anim->height)) ++ memset (gdk_pixbuf_get_pixels (anim->last_frame_data), 0, len); ++ else ++ return NULL; + composite_frame (anim, g_list_nth_data (anim->frames, 0)); + } + +-- +GitLab
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +1 -0
@@ -26,6 +26,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \ file://missing-test-data.patch \ file://CVE-2020-29385.patch \ + file://CVE-2021-20240.patch \ " SRC_URI_append_class-target = " \
Signature · 1 line
2.17.1
This should be proposed for master too. We're still at 2.40.0 there.
Thanks,
Anuj
Quoted 88 lines · Changqing Li
From: Changqing Li <[email protected]>
Signed-off-by Changqing Li <[email protected]>---
.../gdk-pixbuf/CVE-2021-20240.patch | 40
+++++++++++++++++++
.../gdk-pixbuf/gdk-pixbuf_2.40.0.bb | 1 +2 files changed, 41 insertions(+)create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE- 2021-20240.patch
(quoted diff) +0
-020240.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021- 20240.patch
new file mode 100644
index 0000000000..fe594b24bbmeta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch new file +1
-0@@ -0,0 +1,40 @@ +From 086e8adf4cc352cd11572f96066b001b545f354e Mon Sep 17 00:00:002001
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch new file +9
-0+From: Emmanuele Bassi <[email protected]> +Date: Wed, 1 Apr 2020 18:11:55 +0100 +Subject: [PATCH] Check the memset length argument + +Avoid overflows by using the checked multiplication macro for gsize. + +Fixes: #132 + +Upstream-Status: Backported[https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/086e8adf4cc352cd11572f96066b001b545f354e
]meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch new file +8
-0+CVE: CVE-2021-20240 + +Signed-off-by: Changqing Li <[email protected]> +--- + gdk-pixbuf/io-gif-animation.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/gdk-pixbuf/io-gif-animation.c b/gdk-pixbuf/io-gif-
animation.c
+indexc9db3c66e..49674fd2e100644
+---a/gdk-pixbuf/io-gif-animation.c
++++b/gdk-pixbuf/io-gif-animation.c
+@@ -412,11 +412,15 @@gdk_pixbuf_gif_anim_iter_get_pixbuf(GdkPixbufAnimationIter*anim_iter)
+
+ /* If no rendered frame, render the first frame */ + if (anim->last_frame== NULL) {
++ gsize len = 0;
+ if (anim->last_frame_data== NULL)
+anim->last_frame_data=gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,anim->width,anim->height); + if (anim->last_frame_data== NULL)
+ return NULL;
+- memset (gdk_pixbuf_get_pixels(anim-Quoted 2 lines
last_frame_data), 0,gdk_pixbuf_get_rowstride(anim-last_frame_data) *anim->height);++ if (
g_size_checked_mul(&len,gdk_pixbuf_get_rowstride(anim->last_frame_data),anim->height)) ++ memset (gdk_pixbuf_get_pixels(anim-Quoted 1 line
last_frame_data), 0, len);++ else
++ return NULL;
+composite_frame(anim,g_list_nth_data(anim-Quoted 1 line
frames, 0));
+ }
+
+--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch new file +1
-0+GitLabmeta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +0
-0@@ -26,6 +26,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \
file://missing-test-data.patch \
file://CVE-2020-29385.patch \
+ file://CVE-2021-20240.patch \
"
SRC_URI_append_class-target = " \
Quoted 7 lines · Anuj
[Please note: This e-mail is from an EXTERNAL e-mail address]
This should be proposed for master too. We're still at 2.40.0 there.
Thanks,
Anuj
I plan to upgrade gdk-pixbuf on master to 2.42.6, which already fix this CVE.
Quoted 90 lines · Changqing Li
Quoted 88 lines
From: Changqing Li <[email protected]>
Signed-off-by Changqing Li <[email protected]>--- .../gdk-pixbuf/CVE-2021-20240.patch | 40 +++++++++++++++++++ .../gdk-pixbuf/gdk-pixbuf_2.40.0.bb | 1 + 2 files changed, 41 insertions(+)create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-
2021-20240.patch(quoted diff) +0
-020240.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021- 20240.patch
new file mode 100644
index 0000000000..fe594b24bbmeta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch new file +1
-0@@ -0,0 +1,40 @@ +From 086e8adf4cc352cd11572f96066b001b545f354e Mon Sep 17 00:00:002001
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch new file +9
-0+From: Emmanuele Bassi <[email protected]> +Date: Wed, 1 Apr 2020 18:11:55 +0100 +Subject: [PATCH] Check the memset length argument + +Avoid overflows by using the checked multiplication macro for gsize. + +Fixes: #132 + +Upstream-Status: Backported[https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/086e8adf4cc352cd11572f96066b001b545f354e
]meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch new file +8
-0+CVE: CVE-2021-20240 + +Signed-off-by: Changqing Li <[email protected]> +--- + gdk-pixbuf/io-gif-animation.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/gdk-pixbuf/io-gif-animation.c b/gdk-pixbuf/io-gif-
animation.c
+indexc9db3c66e..49674fd2e100644
+---a/gdk-pixbuf/io-gif-animation.c
++++b/gdk-pixbuf/io-gif-animation.c
+@@ -412,11 +412,15 @@gdk_pixbuf_gif_anim_iter_get_pixbuf(GdkPixbufAnimationIter*anim_iter)meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch new file +6
-0+ + /* If no rendered frame, render the first frame */ + if (anim->last_frame == NULL) { ++ gsize len = 0; + if (anim->last_frame_data == NULL) + anim->last_frame_data = gdk_pixbuf_new(
GDK_COLORSPACE_RGB, TRUE, 8,anim->width,anim->height);meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch new file +3
-0+ if (anim->last_frame_data == NULL) + return NULL; +- memset (gdk_pixbuf_get_pixels (anim-Quoted 2 lines
last_frame_data), 0,gdk_pixbuf_get_rowstride(anim-last_frame_data) *anim->height);++ if (
g_size_checked_mul(&len,gdk_pixbuf_get_rowstride(anim->last_frame_data),anim->height))
++ memset (gdk_pixbuf_get_pixels(anim-Quoted 1 line
last_frame_data), 0, len);++ else
++ return NULL;
+composite_frame(anim,g_list_nth_data(anim-Quoted 1 line
frames, 0));
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch new file +4
-0+ } + +-- +GitLabmeta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +1
-0@@ -26,6 +26,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \ file://missing-test-data.patch \ file://CVE-2020-29385.patch \ + file://CVE-2021-20240.patch \ "SRC_URI_append_class-target = " \
Quoted 4 lines · Changqing Li
Quoted 2 lines · Anuj
[Please note: This e-mail is from an EXTERNAL e-mail address]
Quoted 8 lines
Quoted 6 lines
This should be proposed for master too. We're still at 2.40.0 there.
Thanks,
Anuj
I plan to upgrade gdk-pixbuf on master to 2.42.6, which already fix this CVE.
Great, thanks!
Quoted 96 lines
Quoted 96 lines · Changqing Li
Quoted 94 lines
From: Changqing Li <[email protected]>
Signed-off-by Changqing Li <[email protected]>---
.../gdk-pixbuf/CVE-2021-20240.patch | 40
+++++++++++++++++++
.../gdk-pixbuf/gdk-pixbuf_2.40.0.bb | 1 +2 files changed, 41 insertions(+)create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk- pixbuf/CVE-
2021-20240.patch(quoted diff) +0
-020240.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021- 20240.patch
new file mode 100644
index 0000000000..fe594b24bbmeta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021- new file +0
-020240.patch
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021- new file +1
-0@@ -0,0 +1,40 @@ +From 086e8adf4cc352cd11572f96066b001b545f354e Mon Sep 1700:00:00
2001meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021- new file +5
-0+From: Emmanuele Bassi <[email protected]> +Date: Wed, 1 Apr 2020 18:11:55 +0100 +Subject: [PATCH] Check the memset length argument + +Avoid overflows by using the checked multiplication macro forgsize.
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021- new file +4
-0+ +Fixes: #132 + +Upstream-Status: Backported[
https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/086e8adf4cc352cd11572f96066b001b545f354e
]meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021- new file +8
-0+CVE: CVE-2021-20240 + +Signed-off-by: Changqing Li <[email protected]> +--- + gdk-pixbuf/io-gif-animation.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/gdk-pixbuf/io-gif-animation.c b/gdk-pixbuf/io-gif-
animation.c
+indexc9db3c66e..49674fd2e100644
+---a/gdk-pixbuf/io-gif-animation.c
++++b/gdk-pixbuf/io-gif-animation.c
+@@ -412,11 +412,15 @@gdk_pixbuf_gif_anim_iter_get_pixbuf(GdkPixbufAnimationIter*anim_iter)
+
+ /* If no rendered frame, render the first frame */ + if (anim->last_frame== NULL) {
++ gsize len = 0;
+ if (anim->last_frame_data== NULL)
+anim->last_frame_data=gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,anim->width,anim->height); + if (anim->last_frame_data== NULL)
+ return NULL;
+- memset (gdk_pixbuf_get_pixels(anim-Quoted 2 lines
last_frame_data), 0,gdk_pixbuf_get_rowstride(anim-last_frame_data) *anim->height);++ if (
g_size_checked_mul(&len,gdk_pixbuf_get_rowstride(anim->last_frame_data),anim->height)) ++ memset (gdk_pixbuf_get_pixels(anim-Quoted 1 line
last_frame_data), 0, len);++ else
++ return NULL;
+composite_frame(anim,g_list_nth_data(anim-Quoted 1 line
frames, 0));
+ }
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021- new file +3
-0+ +-- +GitLabmeta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +0
-0@@ -26,6 +26,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \
file://missing-test-data.patch \
file://CVE-2020-29385.patch \
+ file://CVE-2021-20240.patch \
"SRC_URI_append_class-target = " \