diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-10-09 20:59:25 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-10-15 15:44:24 +0300 |
commit | 6ef3265d2b0f8bc55c5d3fffa253e961ab31b041 (patch) | |
tree | 554e9b914035d95e21c187e75c2ff4396821a49e /poky/meta/recipes-support/libcroco | |
parent | c3966252f9945108d27845e12b7732a825a9ca4e (diff) | |
download | openbmc-6ef3265d2b0f8bc55c5d3fffa253e961ab31b041.tar.xz |
poky: sumo refresh 3b8dc3a88e..36d5cee56b
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 <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-support/libcroco')
-rw-r--r-- | poky/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch | 46 | ||||
-rw-r--r-- | poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb | 3 |
2 files changed, 48 insertions, 1 deletions
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 0000000000..8ac11ec498 --- /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 <qignacio@amazon.com> +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 <okaya@kernel.org> +--- + 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 5b962ee738..c7507e0d51 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" |