From 6ef3265d2b0f8bc55c5d3fffa253e961ab31b041 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 9 Oct 2018 18:59:25 +0100 Subject: poky: sumo refresh 3b8dc3a88e..36d5cee56b MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update poky to sumo HEAD. Andreas Müller (1): libsdl2: Fix left rotated display for RaspPi/VC4/GLES2 Anuj Mittal (2): qemux86-directdisk: remove mem= parameter initramfs-framework/udev: call settle before kill Armin Kuster (1): libcroco: CVE-2017-7961 Awais Belal (1): bitbake: toaster: Fix bitbake flexible path error from Bugzilla #12891 Chong Yi Chai (1): mkefidisk: fix installation of kernel image Paulo Neves (1): bitbake: fetcher: Fixed remote removal not throwing exception. Richard Purdie (1): bitbake: main: Fix environment handling for UI module imports Ross Burton (2): security_flags: disable static PIE in glibc cmake: put cmake.m4 and toolchain file in PN Sinan Kaya (1): gnupg: CVE-2018-9234 Change-Id: Ia9ff256122334cf5f1fb8d377ac3f295605ac68b Signed-off-by: Brad Bishop --- .../gnupg/gnupg/CVE-2018-9234.patch | 28 +++++++++++++ poky/meta/recipes-support/gnupg/gnupg_2.2.4.bb | 1 + .../libcroco/libcroco/CVE-2017-7961.patch | 46 ++++++++++++++++++++++ .../recipes-support/libcroco/libcroco_0.6.12.bb | 3 +- 4 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 poky/meta/recipes-support/gnupg/gnupg/CVE-2018-9234.patch create mode 100644 poky/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch (limited to 'poky/meta/recipes-support') diff --git a/poky/meta/recipes-support/gnupg/gnupg/CVE-2018-9234.patch b/poky/meta/recipes-support/gnupg/gnupg/CVE-2018-9234.patch new file mode 100644 index 000000000..d4ba1d863 --- /dev/null +++ b/poky/meta/recipes-support/gnupg/gnupg/CVE-2018-9234.patch @@ -0,0 +1,28 @@ +From ce055269c80f6e7c1393c0deec7bc5f0d37895ea Mon Sep 17 00:00:00 2001 +From: Sinan Kaya +Date: Sun, 23 Sep 2018 04:05:47 +0000 +Subject: [PATCH] g10: Fix filtering by PK->REQ_USAGE + +Upstream-Status: Backport [https://dev.gnupg.org/rGa17d2d1f690ebe5d005b4589a5fe378b6487c657] +CVE: CVE-2018-9234 +Signed-off-by: Sinan Kaya +--- + g10/getkey.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/g10/getkey.c b/g10/getkey.c +index e31e023..ca2500c 100644 +--- a/g10/getkey.c ++++ b/g10/getkey.c +@@ -1810,6 +1810,8 @@ get_pubkey_byfprint (ctrl_t ctrl, PKT_public_key *pk, kbnode_t *r_keyblock, + ctx.items[0].mode = fprint_len == 16 ? KEYDB_SEARCH_MODE_FPR16 + : KEYDB_SEARCH_MODE_FPR20; + memcpy (ctx.items[0].u.fpr, fprint, fprint_len); ++ if (pk) ++ ctx.req_usage = pk->req_usage; + rc = lookup (ctrl, &ctx, 0, &kb, &found_key); + if (!rc && pk) + pk_from_block (pk, kb, found_key); +-- +2.19.0 + diff --git a/poky/meta/recipes-support/gnupg/gnupg_2.2.4.bb b/poky/meta/recipes-support/gnupg/gnupg_2.2.4.bb index d6bfaff37..d777fcb12 100644 --- a/poky/meta/recipes-support/gnupg/gnupg_2.2.4.bb +++ b/poky/meta/recipes-support/gnupg/gnupg_2.2.4.bb @@ -15,6 +15,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0003-dirmngr-uses-libgpg-error.patch \ file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ file://CVE-2018-12020.patch \ + file://CVE-2018-9234.patch \ " SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch" diff --git a/poky/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch b/poky/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch new file mode 100644 index 000000000..8ac11ec49 --- /dev/null +++ b/poky/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch @@ -0,0 +1,46 @@ +From 5fa3165613b77b516e2b0dc128f73b673bd3ec8b Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro +Date: Sun, 16 Apr 2017 13:56:09 +0200 +Subject: [PATCH] tknzr: support only max long rgb values + +This fixes a possible out of bound when reading rgbs which +are longer than the support MAXLONG + +Upstream-Status: Backport [https://git.gnome.org/browse/libcroco/patch/?id=9ad72875e9f08e4c519ef63d44cdbd94aa9504f7] +CVE: CVE-2017-7961 +Signed-off-by: Sinan Kaya +--- + src/cr-tknzr.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/src/cr-tknzr.c b/src/cr-tknzr.c +index e3af0ee..76886ec 100644 +--- a/src/cr-tknzr.c ++++ b/src/cr-tknzr.c +@@ -1280,6 +1280,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) + status = cr_tknzr_parse_num (a_this, &num); + ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); + ++ if (num->val > G_MAXLONG) { ++ status = CR_PARSING_ERROR; ++ goto error; ++ } ++ + red = num->val; + cr_num_destroy (num); + num = NULL; +@@ -1299,6 +1304,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) + status = cr_tknzr_parse_num (a_this, &num); + ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); + ++ if (num->val > G_MAXLONG) { ++ status = CR_PARSING_ERROR; ++ goto error; ++ } ++ + PEEK_BYTE (a_this, 1, &next_bytes[0]); + if (next_bytes[0] == '%') { + SKIP_CHARS (a_this, 1); +-- +2.19.0 + diff --git a/poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb b/poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb index 5b962ee73..c7507e0d5 100644 --- a/poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb +++ b/poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb @@ -16,7 +16,8 @@ BINCONFIG = "${bindir}/croco-0.6-config" inherit gnomebase gtk-doc binconfig-disabled -SRC_URI += "file://CVE-2017-7960.patch" +SRC_URI += "file://CVE-2017-7960.patch \ + file://CVE-2017-7961.patch " SRC_URI[archive.md5sum] = "bc0984fce078ba2ce29f9500c6b9ddce" SRC_URI[archive.sha256sum] = "ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860" -- cgit v1.2.3