From 6eec0f2bda93145bd2a3653897bfddb7653db46c Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Fri, 24 Apr 2015 11:03:47 +0000 Subject: [PATCH] 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 e69e5e5fa24..29545481963 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;