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

* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Correct error handling.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-02-06 15:51:22 +01:00
parent 911df80c54
commit 89494cb55c
2 changed files with 5 additions and 1 deletions

View file

@ -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

View file

@ -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);