From 4fde1f4b3850815eb902587349f98dc5612e62f4 Mon Sep 17 00:00:00 2001 From: ngie Date: Mon, 18 May 2015 10:45:18 +0000 Subject: MFC r281928: Avoid an infinite loop by ensuring that the amount of bytes read is greater than 0 in MDXFileChunk when calculating the checksum This edgecase can be triggered if the file is truncated while the checksum is being calculated (i.e. the EOF is reached) Differential Revision: https://reviews.freebsd.org/D2351 (patch by darius) PR: 196694 Reviewed by: delphij, ngie Submitted by: Daniel O'Connor Sponsored by: EMC / Isilon Storage Division --- lib/libmd/mdXhl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libmd/mdXhl.c b/lib/libmd/mdXhl.c index e69e5e5..2954548 100644 --- a/lib/libmd/mdXhl.c +++ b/lib/libmd/mdXhl.c @@ -74,7 +74,7 @@ MDXFileChunk(const char *filename, char *buf, off_t ofs, off_t len) i = read(f, buffer, sizeof(buffer)); else i = read(f, buffer, n); - if (i < 0) + if (i <= 0) break; MDXUpdate(&ctx, buffer, i); n -= i; -- cgit v1.1