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

2008-06-09 Pavel Roskin <proski@gnu.org>

Browse source 
* fs/minix.c (grub_minix_mount): Handle error reading
	superblock.
This commit is contained in:
proski 2008-06-09 15:32:43 +00:00
parent f5679726cd
commit 40fd3a2b99
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-06-09 Pavel Roskin <proski@gnu.org>
* fs/minix.c (grub_minix_mount): Handle error reading
superblock.
2008-06-08 Robert Millan <rmh@aybabtu.com> 2008-06-08 Robert Millan <rmh@aybabtu.com>
* util/i386/pc/grub-setup.c (main): If install drive is an LVM, * util/i386/pc/grub-setup.c (main): If install drive is an LVM,

15
fs/minix.c
View file

@ -422,6 +422,8 @@ grub_minix_mount (grub_disk_t disk)
/* Read the superblock. */ /* Read the superblock. */
grub_disk_read (disk, GRUB_MINIX_SBLOCK, 0, grub_disk_read (disk, GRUB_MINIX_SBLOCK, 0,
sizeof (struct grub_minix_sblock),(char *) &data->sblock); sizeof (struct grub_minix_sblock),(char *) &data->sblock);
if (grub_errno)
goto fail;
if (grub_le_to_cpu16 (data->sblock.magic) == GRUB_MINIX_MAGIC) if (grub_le_to_cpu16 (data->sblock.magic) == GRUB_MINIX_MAGIC)
{ {
@ -444,16 +446,17 @@ grub_minix_mount (grub_disk_t disk)
data->filename_size = 30; data->filename_size = 30;
} }
else else
{ goto fail;
grub_free (data);
grub_error (GRUB_ERR_BAD_FS, "not an minix filesystem");
return 0;
}
data->disk = disk; data->disk = disk;
data->linknest = 0; data->linknest = 0;
return data; return data;
fail:
grub_free (data);
grub_error (GRUB_ERR_BAD_FS, "not a minix filesystem");
return 0;
} }
static grub_err_t static grub_err_t