diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-10-22 14:54:43 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-10-23 15:35:46 -0400 |
| commit | 71eb843837c7ad2f8dfff8b07092e379ab547bb8 (patch) | |
| tree | f9eecd64cd7dc4df803a3455c807db4b37a0d14d /gnu/packages/patches/unzip-CVE-2015-7697.patch | |
| parent | b747a9db1ebcd6383a2555f5acb933fcd204a81c (diff) | |
gnu: unzip: Reorganize security fixes for improved clarity.
* gnu/packages/patches/unzip-fix-overflows-and-infloop.patch: Delete
file. Its contents are now split into the following new files:
* gnu/packages/patches/unzip-CVE-2015-7696.patch,
gnu/packages/patches/unzip-CVE-2015-7697.patch,
gnu/packages/patches/unzip-overflow-on-invalid-input.patch: New files.
* gnu-system.am (dist_patch_DATA): Adjust accordingly.
* gnu/packages/zip.scm (unzip)[source]: Adjust patches accordingly.
Diffstat (limited to 'gnu/packages/patches/unzip-CVE-2015-7697.patch')
| -rw-r--r-- | gnu/packages/patches/unzip-CVE-2015-7697.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/gnu/packages/patches/unzip-CVE-2015-7697.patch b/gnu/packages/patches/unzip-CVE-2015-7697.patch new file mode 100644 index 0000000000..d688b42495 --- /dev/null +++ b/gnu/packages/patches/unzip-CVE-2015-7697.patch @@ -0,0 +1,28 @@ +Copied from Debian. + +From: Kamil Dudka <kdudka@redhat.com> +Date: Mon, 14 Sep 2015 18:24:56 +0200 +Subject: fix infinite loop when extracting empty bzip2 data +Bug-Debian: https://bugs.debian.org/802160 +Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1260944 +Origin: other, https://bugzilla.redhat.com/attachment.cgi?id=1073339 + +--- + extract.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/extract.c ++++ b/extract.c +@@ -2728,6 +2728,12 @@ + int repeated_buf_err; + bz_stream bstrm; + ++ if (G.incnt <= 0 && G.csize <= 0L) { ++ /* avoid an infinite loop */ ++ Trace((stderr, "UZbunzip2() got empty input\n")); ++ return 2; ++ } ++ + #if (defined(DLL) && !defined(NO_SLIDE_REDIR)) + if (G.redirect_slide) + wsize = G.redirect_size, redirSlide = G.redirect_buffer; |