diff options
author | Sona Sarmadi <sona.sarmadi@enea.com> | 2015-11-12 15:21:42 +0100 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-11-20 15:32:31 +0100 |
commit | 388f3a4a2ffb10979d77b119fe0a3bf3acd534bc (patch) | |
tree | 4542815da75fb8e57fe42444a7a507d2ae917086 /meta/recipes-core/libxml/libxml2 | |
parent | b6105680bfb85915e0012c456118441c4c74463d (diff) | |
download | poky-388f3a4a2ffb10979d77b119fe0a3bf3acd534bc.tar.gz |
libxml2: CVE-2015-8035
Fixes DoS when parsing specially crafted XML document
if XZ support is enabled.
References:
https://bugzilla.gnome.org/show_bug.cgi?id=757466
Upstream correction:
https://git.gnome.org/browse/libxml2/commit/?id=
f0709e3ca8f8947f2d91ed34e92e38a4c23eae63
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-core/libxml/libxml2')
-rw-r--r-- | meta/recipes-core/libxml/libxml2/CVE-2015-8035.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-8035.patch b/meta/recipes-core/libxml/libxml2/CVE-2015-8035.patch new file mode 100644 index 0000000000..d08693fa39 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2015-8035.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From f0709e3ca8f8947f2d91ed34e92e38a4c23eae63 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Veillard <veillard@redhat.com> | ||
3 | Date: Tue, 3 Nov 2015 15:31:25 +0800 | ||
4 | Subject: CVE-2015-8035 Fix XZ compression support loop | ||
5 | |||
6 | For https://bugzilla.gnome.org/show_bug.cgi?id=757466 | ||
7 | DoS when parsing specially crafted XML document if XZ support | ||
8 | is compiled in (which wasn't the case for 2.9.2 and master since | ||
9 | Nov 2013, fixed in next commit !) | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> | ||
13 | |||
14 | --- | ||
15 | xzlib.c | 4 ++++ | ||
16 | 1 file changed, 4 insertions(+) | ||
17 | |||
18 | diff --git a/xzlib.c b/xzlib.c | ||
19 | index 0dcb9f4..1fab546 100644 | ||
20 | --- a/xzlib.c | ||
21 | +++ b/xzlib.c | ||
22 | @@ -581,6 +581,10 @@ xz_decomp(xz_statep state) | ||
23 | xz_error(state, LZMA_DATA_ERROR, "compressed data error"); | ||
24 | return -1; | ||
25 | } | ||
26 | + if (ret == LZMA_PROG_ERROR) { | ||
27 | + xz_error(state, LZMA_PROG_ERROR, "compression error"); | ||
28 | + return -1; | ||
29 | + } | ||
30 | } while (strm->avail_out && ret != LZMA_STREAM_END); | ||
31 | |||
32 | /* update available output and crc check value */ | ||
33 | -- | ||
34 | cgit v0.11.2 | ||
35 | |||