From 754137e70cf58a64ad524b704a86b651ba0cde07 Mon Sep 17 00:00:00 2001
From: Petr Stodulka <pstodulk@redhat.com>
Date: Wed, 14 Dec 2016 16:30:36 +0100
Subject: [PATCH] Fix CVE-2016-9844 (rhbz#1404283)

Fixes buffer overflow in zipinfo in similar way like fix for
CVE-2014-9913 provided by upstream.
---
 zipinfo.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/zipinfo.c b/zipinfo.c
index c03620e..accca2a 100644
--- a/zipinfo.c
+++ b/zipinfo.c
@@ -1984,7 +1984,19 @@ static int zi_short(__G)   /* return PK-type error code */
         ush  dnum=(ush)((G.crec.general_purpose_bit_flag>>1) & 3);
         methbuf[3] = dtype[dnum];
     } else if (methnum >= NUM_METHODS) {   /* unknown */
-        sprintf(&methbuf[1], "%03u", G.crec.compression_method);
+        /* 2016-12-05 SMS.
+         * https://launchpad.net/bugs/1643750
+         * Unexpectedly large compression methods overflow
+         * &methbuf[].  Use the old, three-digit decimal format
+         * for values which fit.  Otherwise, sacrifice the "u",
+         * and use four-digit hexadecimal.
+         */
+        if (G.crec.compression_method <= 999) {
+              sprintf( &methbuf[ 1], "%03u", G.crec.compression_method);
+        } else {
+              sprintf( &methbuf[ 0], "%04X", G.crec.compression_method);
+        }
+
     }
 
     for (k = 0;  k < 15;  ++k)
-- 
2.5.5

container.scm?id=6fad3d5985f46ce19672c902fc93e0f91c3fb8f2'>commit</a><a href='/guix/diff/gnu/build/linux-container.scm?id=6fad3d5985f46ce19672c902fc93e0f91c3fb8f2'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/build/linux-container.scm'>
<input type='hidden' name='id' value='6fad3d5985f46ce19672c902fc93e0f91c3fb8f2'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=6fad3d5985f46ce19672c902fc93e0f91c3fb8f2'>root</a>/<a href='/guix/log/gnu?id=6fad3d5985f46ce19672c902fc93e0f91c3fb8f2'>gnu</a>/<a href='/guix/log/gnu/build?id=6fad3d5985f46ce19672c902fc93e0f91c3fb8f2'>build</a>/<a href='/guix/log/gnu/build/linux-container.scm?id=6fad3d5985f46ce19672c902fc93e0f91c3fb8f2'>linux-container.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/build/linux-container.scm?id=6fad3d5985f46ce19672c902fc93e0f91c3fb8f2&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-09-24 17:59:04 +0200'>2022-09-24</span></td><td><a href='/guix/commit/gnu/build/linux-container.scm?id=00d5bb5d7f18555c250b4a6ef0b33b628acc3a3a'>linux-container: Mark socket pair as SOCK_CLOEXEC.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-09-20 19:24:31 +0200'>2022-09-20</span></td><td><a href='/guix/commit/gnu/build/linux-container.scm?id=6abdcef4a68e98f538ab69fde096adc5f5ca4ff4'>linux-container: 'container-excursion*' marks its FDs as FD_CLOEXEC.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-05-01 21:30:35 +0200'>2022-05-01</span></td><td><a href='/guix/commit/gnu/build/linux-container.scm?id=391bd143592241a5bf3555918a5188c789c1c771'>linux-container: Add #:child-is-pid1? parameter to 'call-with-container'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-05-01 21:30:35 +0200'>2022-05-01</span></td><td><a href='/guix/commit/gnu/build/linux-container.scm?id=f6c9763984dafe5023e171878231cbcc6cc1edfa'>linux-container: Ensure signal-handling asyncs get a chance to run.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-05-01 21:30:34 +0200'>2022-05-01</span></td><td><a href='/guix/commit/gnu/build/linux-container.scm?id=a76fa226c8761dd349aaacca7ba041429bce4e73'>linux-container: 'call-with-container' relays SIGTERM and SIGINT.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-01-05 23:44:18 +0100'>2022-01-05</span></td><td><a href='/guix/commit/gnu/build/linux-container.scm?id=bfdeba11f86b18172194b416c6eb59b7cc7ef355'>linux-container: Handle CLONE_NEWCGROUP and use it by default.</a><span class='msg-avail'>...</span></td><td>Ryan Sundberg</td></tr>
<tr><td><span title='2020-12-06 21:55:18 +0100'>2020-12-06</span></td><td><a href='/guix/commit/gnu/build/linux-container.scm?id=329fa5bdbb621dae586cbfb062cbd3b295880ba5'>Revert "linux-container: Correct test for unprivileged user namespace support."</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-12-03 16:25:45 +0000'>2020-12-03</span></td><td><a href='/guix/commit/gnu/build/linux-container.scm?id=8bc5ca5160db3d82bd5b6b2b7ed80c96f42bd33e'>linux-container: Correct test for unprivileged user namespace support.</a><span class='msg-avail'>...</span></td><td>Paul Garlick</td></tr>