From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 27 Jan 2010 03:15:03 +0000 (+0000)
Subject: 2010-01-27  Robert Millan  <rmh.grub@aybabtu.com>
X-Git-Tag: 1.98~109
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67667b9ced0abf5d0931c551d29a6faab2e1623e;p=thirdparty%2Fgrub.git

2010-01-27  Robert Millan  <rmh.grub@aybabtu.com>

	* kern/disk.c (grub_disk_read): Fix bug that would cause infinite
	loop when using read hooks on files whose size isn't sector-aligned.
---

diff --git a/ChangeLog b/ChangeLog
index 6c79d2b30..e0ee80d22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-27  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* kern/disk.c (grub_disk_read): Fix bug that would cause infinite
+	loop when using read hooks on files whose size isn't sector-aligned.
+
 2010-01-27  Robert Millan  <rmh.grub@aybabtu.com>
 
 	Remove unused parameter.
diff --git a/kern/disk.c b/kern/disk.c
index 544896f2f..075838d1e 100644
--- a/kern/disk.c
+++ b/kern/disk.c
@@ -464,12 +464,14 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
 	      if (disk->read_hook)
 		while (size)
 		  {
+		    grub_size_t to_read = (size > GRUB_DISK_SECTOR_SIZE) ? GRUB_DISK_SECTOR_SIZE : size;
 		    (disk->read_hook) (sector, real_offset,
-				       ((size > GRUB_DISK_SECTOR_SIZE)
-					? GRUB_DISK_SECTOR_SIZE
-					: size));
+				       to_read);
+		    if (grub_errno != GRUB_ERR_NONE)
+		      goto finish;
+
 		    sector++;
-		    size -= GRUB_DISK_SECTOR_SIZE - real_offset;
+		    size -= to_read - real_offset;
 		    real_offset = 0;
 		  }