Skip to contentSkip to conversation

Decompressors: Check for read errors in decompress_unlzma.c

PATCH New Lasse Collin 1 participant 1 message Nov 23, 2010 Library code

lore
Share & tools
lore
#0 lore raw

PATCH 2/4 Decompressors: Check for read errors in decompress_unlzma.c

From: Lasse Collin <[email protected]>

Return value of rc->fill() is checked in rc_read() and error() is called when needed, but then the code continues as if nothing had happened.

rc_read() is a void function and it's on the top of performance critical call stacks, so propagating the error code via return values doesn't sound like the best fix. It seems better to check rc->buffer_size (which holds the return value of rc->fill()) in the main loop. It does nothing bad that the code runs a little with unknown data after a failed rc->fill().

This fixes an infinite loop in initramfs decompression if the LZMA-compressed initramfs image is corrupt.

---

lib/decompress_unlzma.c renamed from lib/decompress_unlzma.c.orig +3 -0
@@ -637,6 +637,8 @@ STATIC inline int INIT unlzma(unsigned c
 			if (cst.rep0 == 0)
 				break;
 		}
+		if (rc.buffer_size <= 0)
+			goto exit_3;
 	}
 
 	if (posp)
@@ -644,6 +646,7 @@ STATIC inline int INIT unlzma(unsigned c
 	if (wr.flush)
 		wr.flush(wr.buffer, wr.buffer_pos);
 	ret = 0;
+exit_3:
 	large_free(p);
 exit_2:
 	if (!output)