From 38386bd482c0a8102a79958cb3eddcb97a167ca3 Mon Sep 17 00:00:00 2001
From: Con Kolivas <kernel@kolivas.org>
Date: Fri, 9 Mar 2018 17:39:40 +1100
Subject: [PATCH] CVE-2017-8842 Fix divide-by-zero in bufRead::get

---
 libzpaq/libzpaq.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libzpaq/libzpaq.h b/libzpaq/libzpaq.h
index 93387da..cbe211d 100644
--- a/libzpaq/libzpaq.h
+++ b/libzpaq/libzpaq.h
@@ -465,7 +465,8 @@ struct bufRead: public libzpaq::Reader {
 
 	int get() {
 		if (progress && !(*s_len % 128)) {
-			int pct = (total_len - *s_len) * 100 / total_len;
+			int pct = (total_len > 0) ?
+				(total_len - *s_len) * 100 / total_len : 100;
 
 			if (pct / 10 != *last_pct / 10) {
 				int i;
option value='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=dcfb99d4cb88e210ecdf07e4a32914b0eef9949f'>refs</a><a class='active' href='/guix/log/nix/libstore/gc.cc'>log</a><a href='/guix/tree/nix/libstore/gc.cc?id=dcfb99d4cb88e210ecdf07e4a32914b0eef9949f'>tree</a><a href='/guix/commit/nix/libstore/gc.cc?id=dcfb99d4cb88e210ecdf07e4a32914b0eef9949f'>commit</a><a href='/guix/diff/nix/libstore/gc.cc?id=dcfb99d4cb88e210ecdf07e4a32914b0eef9949f'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/libstore/gc.cc'>
<input type='hidden' name='id' value='dcfb99d4cb88e210ecdf07e4a32914b0eef9949f'/><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=dcfb99d4cb88e210ecdf07e4a32914b0eef9949f'>root</a>/<a href='/guix/log/nix?id=dcfb99d4cb88e210ecdf07e4a32914b0eef9949f'>nix</a>/<a href='/guix/log/nix/libstore?id=dcfb99d4cb88e210ecdf07e4a32914b0eef9949f'>libstore</a>/<a href='/guix/log/nix/libstore/gc.cc?id=dcfb99d4cb88e210ecdf07e4a32914b0eef9949f'>gc.cc</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/nix/libstore/gc.cc?id=dcfb99d4cb88e210ecdf07e4a32914b0eef9949f&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-10-16 22:53:40 +0200'>2019-10-16</span></td><td><a href='/guix/commit/nix/libstore/gc.cc?id=47e99e626b46b2fc433506a822d251de68ad6241'>daemon: Remove traces of 'NIX_ROOT_FINDER'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 2e3e5d21988fc2cafb2a9eaf4b00976ea425629d.

* build-aux/test-env.in: Remove mentions of 'NIX_ROOT_FINDER'.
* nix/libstore/gc.cc (LocalStore::collectGarbage): Adjust comment
accordingly.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-08 11:49:24 +0200'>2019-09-08</span></td><td><a href='/guix/commit/nix/libstore/gc.cc?id=2e3e5d21988fc2cafb2a9eaf4b00976ea425629d'>daemon: Invoke 'guix gc --list-busy' instead of 'list-runtime-roots'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/scripts/list-runtime-roots.in: Remove.
* guix/store/roots.scm (%proc-directory): New variable.
(proc-file-roots, proc-exe-roots, proc-cwd-roots)
(proc-fd-roots, proc-maps-roots, proc-environ-roots)
(referenced-files, canonicalize-store-item, busy-store-items): New
procedures, taken from 'list-runtime-roots.in'.
* nix/libstore/globals.hh (Settings)[guixProgram]: New field.
* nix/libstore/globals.cc (Settings::processEnvironment): Initialize
'guixProgram'.
* nix/libstore/gc.cc (addAdditionalRoots): Drop code related to
'NIX_ROOT_FINDER'.  Run "guix gc --list-busy".
* nix/local.mk (nodist_pkglibexec_SCRIPTS): Remove
'scripts/list-runtime-roots'.
* config-daemon.ac: Don't output nix/scripts/list-runtime-roots.
* build-aux/pre-inst-env.in: Don't set 'NIX_ROOT_FINDER'.
Set 'GUIX'.
* doc/guix.texi (Invoking guix gc): Document '--list-busy'.
* guix/scripts/gc.scm (show-help, %options): Add "--list-busy".
(guix-gc)[list-busy]: New procedure.
Handle the 'list-busy' action.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-08-30 01:33:45 +0200'>2019-08-30</span></td><td><a href='/guix/commit/nix/libstore/gc.cc?id=546a709f202024c8a5173ad372a87ddc1c284c63'>daemon: Don't reply on 'st_blocks'.</a><span class='msg-avail'>...<span class='msg-tooltip'>Ported by Ludovic Courtès &lt;ludo@gnu.org&gt;
from &lt;https://github.com/NixOS/nix/commit/a2c4fcd5e9782dc8d2998773380c7171ee53b813&gt;.

* nix/libstore/gc.cc (LocalStore::removeUnusedLinks): Use 'st.st_size'
instead of 'st.st_blocks * 512'.
* nix/libutil/util.cc (_deletePath): Likewise.
</span></span></td><td>Eelco Dolstra</td></tr>