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

* grub-core/disk/geli.c (grub_md_sha256_real): Respect format security.

Browse source 
(grub_md_sha512_real): Likewise.
	(grub_util_get_geli_uuid): Likewise.
	* grub-core/kern/emu/hostdisk.c (grub_util_get_fd_sectors): Likewise.
	(grub_util_biosdisk_open): Fix format specification.
	Respect format security.
	* grub-core/kern/emu/misc.c (xmalloc): Respect format security.
	(xrealloc): Likewise.
	(xasprintf): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-10 14:01:53 +01:00
parent 5ebd976935
commit 7e94d044ad
4 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
grub-core/kern/emu/hostdisk.c
View file

@ -308,7 +308,7 @@ grub_util_get_fd_sectors (int fd, const char *name, unsigned *log_secsize)
return minfo.dki_capacity;
# else
if (nr & ((1 << log_sector_size) - 1))
grub_util_error (_("unaligned device size"));
grub_util_error ("%s", _("unaligned device size"));
return (nr >> log_sector_size);
# endif
@ -387,7 +387,8 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
close (fd);
grub_util_info ("the size of %s is %llu", name, disk->total_sectors);
grub_util_info ("the size of %s is %" PRIuGRUB_UINT64_T,
name, disk->total_sectors);
return GRUB_ERR_NONE;
}
@ -771,7 +772,7 @@ grub_hostdisk_os_dev_to_grub_drive (const char *os_disk, int add)
return NULL;
if (i == ARRAY_SIZE (map))
grub_util_error (_("device count exceeds limit"));
grub_util_error ("%s", _("device count exceeds limit"));
map[i].device = xstrdup (os_disk);
map[i].drive = xmalloc (sizeof ("hostdisk/") + strlen (os_disk));