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

grub_dmraid_nv_detect: Do not divide by zero.

Browse source
This commit is contained in:
Vladimir Serbinenko 2015-01-20 15:01:58 +01:00
parent 98f74998d5
commit 935863518f
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2015-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/dmraid_nvidia.c (grub_dmraid_nv_detect): Do not
divide by zero.
2015-01-20 Vladimir Serbinenko <phcoder@gmail.com> 2015-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/hfs.c (grub_hfs_mount): Additional filesystem * grub-core/fs/hfs.c (grub_hfs_mount): Additional filesystem

6
grub-core/disk/dmraid_nvidia.c
View file

@ -129,6 +129,9 @@ grub_dmraid_nv_detect (grub_disk_t disk,
case NV_LEVEL_0: case NV_LEVEL_0:
level = 0; level = 0;
disk_size = sb.capacity / sb.array.total_volumes; disk_size = sb.capacity / sb.array.total_volumes;
if (sb.array.total_volumes == 0)
/* Not RAID. */
return NULL;
break; break;
case NV_LEVEL_1: case NV_LEVEL_1:
@ -139,6 +142,9 @@ grub_dmraid_nv_detect (grub_disk_t disk,
case NV_LEVEL_5: case NV_LEVEL_5:
level = 5; level = 5;
disk_size = sb.capacity / (sb.array.total_volumes - 1); disk_size = sb.capacity / (sb.array.total_volumes - 1);
if (sb.array.total_volumes == 0 || sb.array.total_volumes == 1)
/* Not RAID. */
return NULL;
break; break;
default: default: