summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libcroco
diff options
context:
space:
mode:
authorOleksandr Kravchuk <open.source@oleksandr-kravchuk.com>2019-04-23 00:54:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-23 23:30:19 +0100
commitaf1c9b71c883da7e61d2474feca373b11d228a6b (patch)
tree71fbf440c8215a3c9512214cb9b0f2239ab89a4d /meta/recipes-support/libcroco
parentc0407a8ecb4eaa3bf7644483112627cf44c2041d (diff)
downloadpoky-af1c9b71c883da7e61d2474feca373b11d228a6b.tar.gz
libcroco: update to 0.6.13
Removed patches were upstreamed. (From OE-Core rev: 76285dad7baf00624500bef4ac073fcb0839ecbe) Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libcroco')
-rw-r--r--meta/recipes-support/libcroco/libcroco/CVE-2017-7960.patch56
-rw-r--r--meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch45
-rw-r--r--meta/recipes-support/libcroco/libcroco_0.6.13.bb (renamed from meta/recipes-support/libcroco/libcroco_0.6.12.bb)8
3 files changed, 2 insertions, 107 deletions
diff --git a/meta/recipes-support/libcroco/libcroco/CVE-2017-7960.patch b/meta/recipes-support/libcroco/libcroco/CVE-2017-7960.patch
deleted file mode 100644
index f6f43c3d26..0000000000
--- a/meta/recipes-support/libcroco/libcroco/CVE-2017-7960.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1input: check end of input before reading a byte
2
3When reading bytes we weren't check that the index wasn't
4out of bound and this could produce an invalid read which
5could deal to a security bug.
6
7Upstream-Status: Backport[https://gitlab.gnome.org/GNOME/libcroco/
8 commit/898e3a8c8c0314d2e6b106809a8e3e93cf9d4394]
9
10CVE: CVE-2017-7960
11
12Signed-off-by: Changqing Li <changqing.li@windriver.com>
13
14diff --git a/src/cr-input.c b/src/cr-input.c
15index 49000b1f5f07fe057135f1b8fc69bdcf9613e300..3b63a88ee3b1c56778e58172d147d958951bf099 100644
16--- a/src/cr-input.c
17+++ b/src/cr-input.c
18@@ -256,7 +256,7 @@ cr_input_new_from_uri (const gchar * a_file_uri, enum CREncoding a_enc)
19 *we should free buf here because it's own by CRInput.
20 *(see the last parameter of cr_input_new_from_buf().
21 */
22- buf = NULL ;
23+ buf = NULL;
24 }
25
26 cleanup:
27@@ -404,6 +404,8 @@ cr_input_get_nb_bytes_left (CRInput const * a_this)
28 enum CRStatus
29 cr_input_read_byte (CRInput * a_this, guchar * a_byte)
30 {
31+ gulong nb_bytes_left = 0;
32+
33 g_return_val_if_fail (a_this && PRIVATE (a_this)
34 && a_byte, CR_BAD_PARAM_ERROR);
35
36@@ -413,6 +415,12 @@ cr_input_read_byte (CRInput * a_this, guchar * a_byte)
37 if (PRIVATE (a_this)->end_of_input == TRUE)
38 return CR_END_OF_INPUT_ERROR;
39
40+ nb_bytes_left = cr_input_get_nb_bytes_left (a_this);
41+
42+ if (nb_bytes_left < 1) {
43+ return CR_END_OF_INPUT_ERROR;
44+ }
45+
46 *a_byte = PRIVATE (a_this)->in_buf[PRIVATE (a_this)->next_byte_index];
47
48 if (PRIVATE (a_this)->nb_bytes -
49@@ -477,7 +485,6 @@ cr_input_read_char (CRInput * a_this, guint32 * a_char)
50 if (*a_char == '\n') {
51 PRIVATE (a_this)->end_of_line = TRUE;
52 }
53-
54 }
55
56 return status;
diff --git a/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch b/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch
deleted file mode 100644
index 35471ec7ee..0000000000
--- a/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1CVE: CVE-2017-7961
2Upstream-Status: Backport
3Signed-off-by: Ross Burton <ross.burton@intel.com>
4
5From 9ad72875e9f08e4c519ef63d44cdbd94aa9504f7 Mon Sep 17 00:00:00 2001
6From: Ignacio Casal Quinteiro <qignacio@amazon.com>
7Date: Sun, 16 Apr 2017 13:56:09 +0200
8Subject: [PATCH] tknzr: support only max long rgb values
9
10This fixes a possible out of bound when reading rgbs which
11are longer than the support MAXLONG
12---
13 src/cr-tknzr.c | 10 ++++++++++
14 1 file changed, 10 insertions(+)
15
16diff --git a/src/cr-tknzr.c b/src/cr-tknzr.c
17index 1a7cfeb..1548c35 100644
18--- a/src/cr-tknzr.c
19+++ b/src/cr-tknzr.c
20@@ -1279,6 +1279,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb)
21 status = cr_tknzr_parse_num (a_this, &num);
22 ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL));
23
24+ if (num->val > G_MAXLONG) {
25+ status = CR_PARSING_ERROR;
26+ goto error;
27+ }
28+
29 red = num->val;
30 cr_num_destroy (num);
31 num = NULL;
32@@ -1298,6 +1303,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb)
33 status = cr_tknzr_parse_num (a_this, &num);
34 ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL));
35
36+ if (num->val > G_MAXLONG) {
37+ status = CR_PARSING_ERROR;
38+ goto error;
39+ }
40+
41 PEEK_BYTE (a_this, 1, &next_bytes[0]);
42 if (next_bytes[0] == '%') {
43 SKIP_CHARS (a_this, 1);
44--
452.18.1
diff --git a/meta/recipes-support/libcroco/libcroco_0.6.12.bb b/meta/recipes-support/libcroco/libcroco_0.6.13.bb
index f95a583134..9171a9de5c 100644
--- a/meta/recipes-support/libcroco/libcroco_0.6.12.bb
+++ b/meta/recipes-support/libcroco/libcroco_0.6.13.bb
@@ -16,9 +16,5 @@ BINCONFIG = "${bindir}/croco-0.6-config"
16 16
17inherit gnomebase gtk-doc binconfig-disabled 17inherit gnomebase gtk-doc binconfig-disabled
18 18
19SRC_URI += "file://CVE-2017-7960.patch \ 19SRC_URI[archive.md5sum] = "c80c5a8385011a0260dce6bd0da93dce"
20 file://CVE-2017-7961.patch \ 20SRC_URI[archive.sha256sum] = "767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4"
21 "
22
23SRC_URI[archive.md5sum] = "bc0984fce078ba2ce29f9500c6b9ddce"
24SRC_URI[archive.sha256sum] = "ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860"