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

2010-08-01 Robert Millan <rmh@gnu.org> 

Prevent accidental use of uninitialized libzfs_handle.
	
	* util/grub-probe.c (main): Move grub_util_init_libzfs() call to ...
	* kern/emu/getroot.c (find_root_device_from_libzfs): ... here.
	* util/misc.c (grub_util_init_libzfs): Make this function idempotent.
This commit is contained in:
Robert Millan 2010-08-01 15:23:44 +02:00
parent ce04ef47e2
commit deb0caa38e
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2010-08-01 Robert Millan <rmh@gnu.org>
Prevent accidental use of uninitialized libzfs_handle.
* util/grub-probe.c (main): Move grub_util_init_libzfs() call to ...
* kern/emu/getroot.c (find_root_device_from_libzfs): ... here.
* util/misc.c (grub_util_init_libzfs): Make this function idempotent.
2010-08-01 Colin Watson <cjwatson@ubuntu.com>
* util/grub.d/20_linux_xen.in: Don't use UUID for LVM root (matching

2
kern/emu/getroot.c
View File

@ -289,6 +289,8 @@ find_root_device_from_libzfs (const char *dir)
nvlist_t **nvlist_array;
unsigned int nvlist_count;
grub_util_init_libzfs ();
zpool = zpool_open (libzfs_handle, poolname);
nvlist = zpool_get_config (zpool, NULL);

1
util/grub-probe.c
View File

@ -359,7 +359,6 @@ main (int argc, char *argv[])
set_program_name (argv[0]);
grub_util_init_nls ();
grub_util_init_libzfs ();
/* Check for options. */
while (1)

7
util/misc.c
View File

@ -309,8 +309,11 @@ void
grub_util_init_libzfs (void)
{
#ifdef HAVE_LIBZFS
libzfs_handle = libzfs_init ();
atexit (fini_libzfs);
if (! libzfs_handle)
{
libzfs_handle = libzfs_init ();
atexit (fini_libzfs);
}
#endif
}
#endif