Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-21 06:49:35 +00:00
Code Issues Packages Projects 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 committed 2011-11-04 13:15:29 +01:00
1 parent 182c872a7b
commit dbd3a32e43
3 files changed
+10 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ChangeLog
+6
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> 2011-11-03 Philipp Matthias Hahn <pmhahn@debian.org>
* util/grub-mkrescue.in: Fix handling xorriso option. * util/grub-mkrescue.in: Fix handling xorriso option.
grub-core/disk/lvm.c
+2 -2
View File
@@ -157,8 +157,8 @@ do_lvm_scan (const char *scan_for)
&& pv->disk->dev->id == disk->dev->id && pv->disk->dev->id == disk->dev->id
&& grub_partition_get_start (pv->disk->partition) && grub_partition_get_start (pv->disk->partition)
== grub_partition_get_start (disk->partition) == grub_partition_get_start (disk->partition)
&& grub_partition_get_len (pv->disk->partition) && grub_disk_get_size (pv->disk)
== grub_partition_get_len (disk->partition)) == grub_disk_get_size (disk))
{ {
grub_disk_close (disk); grub_disk_close (disk);
return 0; return 0;
grub-core/disk/raid.c
+2 -2
View File
@@ -123,8 +123,8 @@ scan_devices (const char *arname)
&& m->device->dev->id == m->device->dev->id && m->device->dev->id == m->device->dev->id
&& grub_partition_get_start (m->device->partition) && grub_partition_get_start (m->device->partition)
== grub_partition_get_start (disk->partition) == grub_partition_get_start (disk->partition)
&& grub_partition_get_len (m->device->partition) && grub_disk_get_size (m->device)
== grub_partition_get_len (disk->partition)) == grub_disk_get_size (disk))
{ {
grub_disk_close (disk); grub_disk_close (disk);
return 0; return 0;