* grub-core/kern/disk_common.c: Clump disk size to 1EiB.

diff --git a/ChangeLog b/ChangeLog
index 9e159a8da87c9aa40a3f386f2e8563a70923ddb1..6c389b01037aa7369f206388b2a0e8247e2de1e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/disk_common.c: Clump disk size to 1EiB.
+
 2014-08-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_rw): Add

diff --git a/grub-core/kern/disk_common.c b/grub-core/kern/disk_common.c
index fb19778ae4f44e86ac59c5919a001ed6a085d671..2ca12b5f8c359d78c6f794de573fa1efdacd9508 100644 (file)
--- a/grub-core/kern/disk_common.c
+++ b/grub-core/kern/disk_common.c
@@ -7,6 +7,8 @@ grub_disk_adjust_range (grub_disk_t disk, grub_disk_addr_t *sector,
                        grub_off_t *offset, grub_size_t size)
 {
   grub_partition_t part;
+  grub_disk_addr_t total_sectors;
+
   *sector += *offset >> GRUB_DISK_SECTOR_BITS;
   *offset &= GRUB_DISK_SECTOR_SIZE - 1;
 
@@ -27,12 +29,20 @@ grub_disk_adjust_range (grub_disk_t disk, grub_disk_addr_t *sector,
       *sector += start;
     }
 
-  if (disk->total_sectors != GRUB_DISK_SIZE_UNKNOWN
-      && ((disk->total_sectors << (disk->log_sector_size - GRUB_DISK_SECTOR_BITS)) <= *sector
-         || ((*offset + size + GRUB_DISK_SECTOR_SIZE - 1)
-         >> GRUB_DISK_SECTOR_BITS) > (disk->total_sectors
-                                      << (disk->log_sector_size
-                                          - GRUB_DISK_SECTOR_BITS)) - *sector))
+  /* Transform total_sectors to number of 512B blocks.  */
+  total_sectors = disk->total_sectors << (disk->log_sector_size - GRUB_DISK_SECTOR_BITS);
+
+  /* Some drivers have problems with disks above reasonable.
+     Treat unknown as 1EiB disk. While on it, clamp the size to 1EiB.
+     Just one condition is enough since GRUB_DISK_UNKNOWN_SIZE << ls is always
+     above 9EiB.
+  */
+  if (total_sectors > (1ULL << 51))
+    total_sectors = (1ULL << 51);
+
+  if ((total_sectors <= *sector
+       || ((*offset + size + GRUB_DISK_SECTOR_SIZE - 1)
+          >> GRUB_DISK_SECTOR_BITS) > total_sectors - *sector))
     return grub_error (GRUB_ERR_OUT_OF_RANGE,
                       N_("attempt to read or write outside of disk `%s'"), disk->name);