From dbd3a32e4325699e997de191b9c265c301a888bd Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 4 Nov 2011 13:15:29 +0100 Subject: [PATCH] * grub-core/disk/raid.c (scan_devices): Don't derference NULL on whole disk. * grub-core/disk/lvm.c (do_lvm_scan): Likewise. --- ChangeLog | 6 ++++++ grub-core/disk/lvm.c | 4 ++-- grub-core/disk/raid.c | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 028bffe5c..89974cff6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-11-04 Vladimir Serbinenko + + * 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 * util/grub-mkrescue.in: Fix handling xorriso option. diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c index 7c65db4ab..4020fc427 100644 --- 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 07249eabc..e4c53e73b 100644 --- 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;