* grub-core/disk/raid.c (scan_devices): Don't derference NULL on whole

	disk.
	* grub-core/disk/lvm.c (do_lvm_scan): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 028bffe5c153147b032c07f319c029eb3d0b2281..89974cff6bd1d38688b0368726af05b1ffdeb817 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/disk/raid.c (scan_devices): Don't derference NULL on whole
+       disk.
+       * grub-core/disk/lvm.c (do_lvm_scan): Likewise.
+
 2011-11-03  Philipp Matthias Hahn <pmhahn@debian.org>
 
        * util/grub-mkrescue.in: Fix handling xorriso option.

diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
index 7c65db4ab12fe40d6a03ba77696589f9ccadb07e..4020fc4271b34391a4e1aa42b516d0734693936f 100644 (file)
--- a/grub-core/disk/lvm.c
+++ b/grub-core/disk/lvm.c
@@ -157,8 +157,8 @@ do_lvm_scan (const char *scan_for)
            && pv->disk->dev->id == disk->dev->id
            && grub_partition_get_start (pv->disk->partition)
            == grub_partition_get_start (disk->partition)
-           && grub_partition_get_len (pv->disk->partition)
-           == grub_partition_get_len (disk->partition))
+           && grub_disk_get_size (pv->disk)
+           == grub_disk_get_size (disk))
          {
            grub_disk_close (disk);
            return 0;

diff --git a/grub-core/disk/raid.c b/grub-core/disk/raid.c
index 07249eabc3c34a601fd3c74db029207521a5b087..e4c53e73bb3d8829713a6f13868cb27bc6aa7bcc 100644 (file)
--- a/grub-core/disk/raid.c
+++ b/grub-core/disk/raid.c
@@ -123,8 +123,8 @@ scan_devices (const char *arname)
                && m->device->dev->id == m->device->dev->id
                && grub_partition_get_start (m->device->partition)
                == grub_partition_get_start (disk->partition)
-               && grub_partition_get_len (m->device->partition)
-               == grub_partition_get_len (disk->partition))
+               && grub_disk_get_size (m->device)
+               == grub_disk_get_size (disk))
              {
                grub_disk_close (disk);
                return 0;