From: Mikko Rapeli <[email protected]> Upstream has disputed CVE-2020-35457 claiming it's not exploitable but the patch is simple to add.
https://security-tracker.debian.org/tracker/CVE-2020-35457 "https://gitlab.gnome.org/GNOME/glib/-/commit/63c5b62f0a984fac9a9700b12f54fe878e016a5d https://gitlab.gnome.org/GNOME/glib/-/issues/2197 Upstream position is that it is not realistically a security issue." For master branch this CVE is not reported by CVE checker: NOTE: glib-2.0-2.66.4 is not vulnerable to CVE-2020-35457 Signed-off-by: Mikko Rapeli <[email protected]> Signed-off-by: Steve Sakoman <[email protected]> --- ...econdition-to-avoid-GOptionEntry-lis.patch | 41 +++++++++++++++++++ meta/recipes-core/glib-2.0/glib-2.0_2.62.6.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-goption-Add-a-precondition-to-avoid-GOptionEntry-lis.patch diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-goption-Add-a-precondition-to-avoid-GOptionEntry-lis.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-goption-Add-a-precondition-to-avoid-GOptionEntry-lis.patch new file mode 100644 index 0000000000..17dcada613 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-goption-Add-a-precondition-to-avoid-GOptionEntry-lis.patch @@ -0,0 +1,41 @@ +From 63c5b62f0a984fac9a9700b12f54fe878e016a5d Mon Sep 17 00:00:00 2001 +From: Philip Withnall <[email protected]> +Date: Wed, 2 Sep 2020 12:38:09 +0100 +Subject: [PATCH] goption: Add a precondition to avoid GOptionEntry list + overflow +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +If the calling code adds more option entries than `G_MAXSIZE` then +there’ll be an integer overflow. This seems vanishingly unlikely (given +that all callers use static option entry lists), but add a precondition +anyway. + +Signed-off-by: Philip Withnall <[email protected]> + +Fixes: #2197 +--- + glib/goption.c | 2 ++ + 1 file changed, 2 insertions(+) + +CVE: CVE-2020-35457 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/63c5b62f0a984fac9a9700b12f54fe878e016a5d] +Comment: adjusted offset by -5 to fix patch fuzz warning + +diff --git a/glib/goption.c b/glib/goption.c +index 9f5b977c4..bb9093a33 100644 +--- a/glib/goption.c ++++ b/glib/goption.c +@@ -2417,6 +2417,8 @@ g_option_group_add_entries (GOptionGroup *group, + + for (n_entries = 0; entries[n_entries].long_name != NULL; n_entries++) ; + ++ g_return_if_fail (n_entries <= G_MAXSIZE - group->n_entries); ++ + group->entries = g_renew (GOptionEntry, group->entries, group->n_entries + n_entries); + + /* group->entries could be NULL in the trivial case where we add no +-- +2.20.1 + diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.62.6.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.62.6.bb index 09d253fbfb..0ad14a0878 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.62.6.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.62.6.bb @@ -17,6 +17,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ file://tzdata-update.patch \ + file://0001-goption-Add-a-precondition-to-avoid-GOptionEntry-lis.patch \ " SRC_URI_append_class-native = " file://relocate-modules.patch" -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#146568): https://lists.openembedded.org/g/openembedded-core/message/146568 Mute This Topic: https://lists.openembedded.org/mt/79585732/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
