2010-02-06 Vladimir Serbinenko <phcoder@gmail.com>

	* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Correct error handling.

diff --git a/ChangeLog b/ChangeLog
index ba2561819f40e1cfc4caf1af1c0abeff3b617681..72d5bd8995e8867c6aa783799d535bc05df86f2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
        * conf/common.rmk (grub_script_check_SOURCES): add missing dependencies.
        (grub_mkpasswd_pbkdf2_SOURCES): Likewise.
 
+2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * disk/ieee1275/ofdisk.c (grub_ofdisk_read): Correct error handling.
+
 2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * fs/i386/pc/pxe.c (grub_pxefs_dir): Return with failure on

diff --git a/disk/ieee1275/ofdisk.c b/disk/ieee1275/ofdisk.c
index 051ece0b9abc25b1bab0a9afd46449ef1269fe06..238cff33dc3dceb746ffd6c0a63ab375196cfa75 100644 (file)
--- a/disk/ieee1275/ofdisk.c
+++ b/disk/ieee1275/ofdisk.c
@@ -248,7 +248,7 @@ grub_ofdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
                       (long long) sector);
   grub_ieee1275_read ((grub_ieee1275_ihandle_t) (unsigned long) disk->data,
                      buf, size * 512UL, &actual);
-  if (actual != actual)
+  if (actual != (grub_ssize_t) (size * 512UL))
     return grub_error (GRUB_ERR_READ_ERROR, "read error on block: %llu",
                       (long long) sector);