diff options
author | Nick Wellnhofer <wellnhofer@aevum.de> | 2018-07-30 13:14:11 +0200 |
---|---|---|
committer | Nick Wellnhofer <wellnhofer@aevum.de> | 2018-07-30 14:35:17 +0200 |
commit | 2240fbf5912054af025fb6e01e26375100275e74 (patch) | |
tree | 3840ecde329f88373f4a1539b23f531e2a9f175d | |
parent | a436374994c47b12d5de1b8b1d191a098fa23594 (diff) | |
download | libxml2-2240fbf5912054af025fb6e01e26375100275e74.tar.gz |
Fix infinite loop in LZMA decompression
Check the liblzma error code more thoroughly to avoid infinite loops.
Closes: https://gitlab.gnome.org/GNOME/libxml2/issues/13
Closes: https://bugzilla.gnome.org/show_bug.cgi?id=794914
This is CVE-2018-9251 and CVE-2018-14567.
Thanks to Dongliang Mu and Simon Wörner for the reports.
-rw-r--r-- | xzlib.c | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -562,6 +562,10 @@ xz_decomp(xz_statep state) "internal error: inflate stream corrupt"); return -1; } + /* + * FIXME: Remapping a couple of error codes and falling through + * to the LZMA error handling looks fragile. + */ if (ret == Z_MEM_ERROR) ret = LZMA_MEM_ERROR; if (ret == Z_DATA_ERROR) @@ -587,6 +591,11 @@ xz_decomp(xz_statep state) xz_error(state, LZMA_PROG_ERROR, "compression error"); return -1; } + if ((state->how != GZIP) && + (ret != LZMA_OK) && (ret != LZMA_STREAM_END)) { + xz_error(state, ret, "lzma error"); + return -1; + } } while (strm->avail_out && ret != LZMA_STREAM_END); /* update available output and crc check value */ |