vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
disk.
	* grub-core/disk/lvm.c (do_lvm_scan): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-11-04 13:15:29 +01:00
parent 182c872a7b
commit dbd3a32e43
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

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

4
grub-core/disk/lvm.c
View file

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

4
grub-core/disk/raid.c
View file

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