[monojob] Avoid overflow when calculating percentage progress

Normalise the progress figures to ensure that multiplication by 100 (to produce a percentage) cannot result in integer overflow. Reported-by: Sven Dreyer <sven@dreyer-net.de> Signed-off-by: Michael Brown <mcb30@ipxe.org>
ipxe · Mar 26, 2011 · 5590faf · 5590faf
1 parent 02a6f46
commit 5590faf
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/core/monojob.c b/src/core/monojob.c
@@ -62,6 +62,8 @@ int monojob_wait ( const char *string ) {
 	int rc;
 	unsigned long last_progress;
 	unsigned long elapsed;
+	unsigned long completed;
+	unsigned long total;
 	unsigned int percentage;
 	int shown_percentage = 0;
 
@@ -85,9 +87,11 @@ int monojob_wait ( const char *string ) {
 			if ( shown_percentage )
 				printf ( "\b\b\b\b    \b\b\b\b" );
 			job_progress ( &monojob, &progress );
-			if ( progress.total ) {
-				percentage = ( ( 100 * progress.completed ) /
-					       progress.total );
+			/* Normalise progress figures to avoid overflow */
+			completed = ( progress.completed / 128 );
+			total = ( progress.total / 128 );
+			if ( total ) {
+				percentage = ( ( 100 * completed ) / total );
 				printf ( "%3d%%", percentage );
 				shown_percentage = 1;
 			} else {