p11-kit: upgrade 0.23.21 -> 0.23.22
PATCH 1/2 p11-kit: upgrade 0.23.21 -> 0.23.22
From: Upgrade Helper <[email protected]>
https://github.com/p11-glue/p11-kit/releases/tag/0.23.22
Release notes:
Fix memory-safety issues that affect the RPC protocol (CVE-2020-29361, CVE-2020-29362, and CVE-2020-29363), discovered and fixed by David Cook
anchor: Prefer persistent format when storing anchor [#329]
common: Fix infloop in p11_path_build [#326, #327]
proxy: C_CloseAllSessions: Make sure that calloc args are non-zero [#325]
common: Check for a NULL locale before freeing it [#321]
Build and test fixes [#313, #315, #317, #318, #319, #323, #330, #333, #334, #335, #338, #339]
---
.../p11-kit/{p11-kit_0.23.21.bb => p11-kit_0.23.22.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/p11-kit/{p11-kit_0.23.21.bb => p11-kit_0.23.22.bb} (87%)meta/recipes-support/p11-kit/p11-kit_0.23.22.bb renamed from meta/recipes-support/p11-kit/p11-kit_0.23.21.bb +2 -2
@@ -8,8 +8,8 @@ DEPENDS = "libtasn1 libtasn1-native libffi" DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" -SRC_URI = "git://github.com/p11-glue/p11-kit" -SRCREV = "fd8b56f3ee971f94dc6fc95411fc01e1c12153ab" +SRC_URI = "git://github.com/p11-glue/p11-kit;branch=0.23" +SRCREV = "bd97afbfe28d5fbbde95ce36ff7a8834fc0291ee" S = "${WORKDIR}/git" PACKAGECONFIG ??= ""
Signature · 1 line
2.17.1
PATCH 2/2 gdk-pixbuf: fix CVE-2020-29385
From: Lee Chee Yang <[email protected]>
Backport patch from
https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81
image file in upstream patch is for test purpose only, it cause error during do_patch so drop it:
File tests/test-images/fail/hang_114.gif: git binary diffs are not supported.
--- .../gdk-pixbuf/CVE-2020-29385.patch | 55 +++++++++++++++++++ .../gdk-pixbuf/gdk-pixbuf_2.40.0.bb | 1 + 2 files changed, 56 insertions(+) create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch new file +55 -0
@@ -0,0 +1,55 @@ +From bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81 Mon Sep 17 00:00:00 2001 +From: Robert Ancell <[email protected]> +Date: Mon, 30 Nov 2020 12:26:12 +1300 +Subject: [PATCH 02/13] gif: Fix LZW decoder accepting invalid LZW code. + +The code value after a reset wasn't being validated, which means we would +accept invalid codes. This could cause an infinite loop in the decoder. + +Fixes CVE-2020-29385 + +Fixes https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/164 + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81] +CVE: CVE-2020-29385 +Signed-off-by: Chee Yang Lee <[email protected]> + +--- + gdk-pixbuf/lzw.c | 13 +++++++------ + 1 files changed, 7 insertions(+), 6 deletions(-) + create mode 100644 tests/test-images/fail/hang_114.gif + +diff --git a/gdk-pixbuf/lzw.c b/gdk-pixbuf/lzw.c +index 9e052a6f7..105daf2b1 100644 +--- a/gdk-pixbuf/lzw.c ++++ b/gdk-pixbuf/lzw.c +@@ -195,19 +195,20 @@ lzw_decoder_feed (LZWDecoder *self, + if (self->last_code != self->clear_code && self->code_table_size < MAX_CODES) { + if (self->code < self->code_table_size) + add_code (self, self->code); +- else if (self->code == self->code_table_size) ++ else + add_code (self, self->last_code); +- else { +- /* Invalid code received - just stop here */ +- self->last_code = self->eoi_code; +- return output_length; +- } + + /* When table is full increase code size */ + if (self->code_table_size == (1 << self->code_size) && self->code_size < LZW_CODE_MAX) + self->code_size++; + } + ++ /* Invalid code received - just stop here */ ++ if (self->code >= self->code_table_size) { ++ self->last_code = self->eoi_code; ++ return output_length; ++ } ++ + /* Convert codeword into indexes */ + n_written += write_indexes (self, output + n_written, output_length - n_written); + } +-- +2.25.1 +
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +1 -0
@@ -24,6 +24,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0004-Do-not-run-tests-when-building.patch \ file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \ file://missing-test-data.patch \ + file://CVE-2020-29385.patch \ " SRC_URI_append_class-target = " \
Signature · 1 line
2.17.1
I believe this update breaks DISTRO_FEATURES += "api-documention" builds, that's why I took it out from my batch. If you can fix that, would be appreciated.
Please remember to 'git commit --amend -s --reset-author' so the patches come from you, and not AUH.
Alex
Quoted 48 lines · Lee Chee Yang
From: Upgrade Helper <[email protected]>
https://github.com/p11-glue/p11-kit/releases/tag/0.23.22
Release notes:
Fix memory-safety issues that affect the RPC protocol (CVE-2020-29361, CVE-2020-29362, and CVE-2020-29363), discovered and fixed by David Cook
anchor: Prefer persistent format when storing anchor [#329]
common: Fix infloop inp11_path_build[#326, #327]
proxy:C_CloseAllSessions: Make sure that calloc args are non-zero [#325]
common: Check for a NULL locale before freeing it [#321] Build and test fixes [#313, #315, #317, #318, #319, #323, #330, #333, #334, #335, #338, #339]Signed-off-by Lee Chee Yang <[email protected]>--- .../p11-kit/{p11-kit_0.23.21.bb => p11-kit_0.23.22.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/p11-kit/{p11-kit_0.23.21.bb =>p11-kit_0.23.22.bb} (87%)
meta/recipes-support/p11-kit/p11-kit_0.23.22.bb renamed from meta/recipes-support/p11-kit/p11-kit_0.23.21.bb +0
-0@@ -8,8 +8,8 @@ DEPENDS = "libtasn1 libtasn1-native libffi" DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True'else ''}"
meta/recipes-support/p11-kit/p11-kit_0.23.22.bb renamed from meta/recipes-support/p11-kit/p11-kit_0.23.21.bb +2
-3-SRC_URI = "git://github.com/p11-glue/p11-kit" -SRCREV = "fd8b56f3ee971f94dc6fc95411fc01e1c12153ab" +SRC_URI = "git://github.com/p11-glue/p11-kit;branch=0.23" +SRCREV = "bd97afbfe28d5fbbde95ce36ff7a8834fc0291ee" S = "${WORKDIR}/git" PACKAGECONFIG ??= "" --2.17.1
Quoted 4 lines · Alexander Kanavin
I believe this update breaks
DISTRO_FEATURES+= "api-documention" builds, that's why I took it out from my batch. If you can fix that, would be appreciated.
I think it's related to:
https://github.com/mesonbuild/meson/issues/2148
So the targets listed in dependencies here:
https://github.com/p11-glue/p11-kit/blob/master/doc/manual/meson.build#L73
aren't actually built.
I tested and it builds fine if we enable manpages as well because then the xmls are actually built via depends for a custom target:
https://github.com/p11-glue/p11-kit/blob/master/doc/manual/meson.build#L125
Thanks,
Anuj