diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-10-22 17:10:41 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-10-22 17:10:41 -0400 |
| commit | 2442e69e4182b592757dad473c8c7b1c48ca8284 (patch) | |
| tree | 7180454106c234d84cfe2e720550db826c091f72 /gnu/packages/patches/unzip-overflow-on-invalid-input.patch | |
| parent | c46c931ecfe7fd4a5cbd979263d28d3f1e02bcca (diff) | |
| download | guix-2442e69e4182b592757dad473c8c7b1c48ca8284.tar.gz guix-2442e69e4182b592757dad473c8c7b1c48ca8284.zip | |
Revert "gnu: unzip: Reorganize security fixes for improved clarity."
This reverts commit c46c931ecfe7fd4a5cbd979263d28d3f1e02bcca.
Diffstat (limited to 'gnu/packages/patches/unzip-overflow-on-invalid-input.patch')
| -rw-r--r-- | gnu/packages/patches/unzip-overflow-on-invalid-input.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/gnu/packages/patches/unzip-overflow-on-invalid-input.patch b/gnu/packages/patches/unzip-overflow-on-invalid-input.patch deleted file mode 100644 index 013002a88c..0000000000 --- a/gnu/packages/patches/unzip-overflow-on-invalid-input.patch +++ /dev/null @@ -1,40 +0,0 @@ -Extracted from a patch in Fedora. - -http://pkgs.fedoraproject.org/cgit/unzip.git/tree/unzip-6.0-heap-overflow-infloop.patch?id=d18f821e - -From bd150334fb4084f5555a6be26b015a0671cb5b74 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka <kdudka@redhat.com> -Date: Tue, 22 Sep 2015 18:52:23 +0200 -Subject: [PATCH 3/3] extract: prevent unsigned overflow on invalid input - -Suggested-by: Stefan Cornelius ---- - extract.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/extract.c b/extract.c -index 29db027..b9ae667 100644 ---- a/extract.c -+++ b/extract.c -@@ -1257,8 +1257,17 @@ static int extract_or_test_entrylist(__G__ numchunk, - if (G.lrec.compression_method == STORED) { - zusz_t csiz_decrypted = G.lrec.csize; - -- if (G.pInfo->encrypted) -+ if (G.pInfo->encrypted) { -+ if (csiz_decrypted <= 12) { -+ /* handle the error now to prevent unsigned overflow */ -+ Info(slide, 0x401, ((char *)slide, -+ LoadFarStringSmall(ErrUnzipNoFile), -+ LoadFarString(InvalidComprData), -+ LoadFarStringSmall2(Inflate))); -+ return PK_ERR; -+ } - csiz_decrypted -= 12; -+ } - if (G.lrec.ucsize != csiz_decrypted) { - Info(slide, 0x401, ((char *)slide, - LoadFarStringSmall2(WrnStorUCSizCSizDiff), --- -2.5.2 - |