sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-27 10:02:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

[comboot] Fix reference counting on replacement images

Browse Source 
When chaining COMBOOT images, the old images now get freed correctly.
This commit is contained in:
Michael Brown
2009-02-17 01:45:12 +00:00
parent 8904cd55f1
commit 14eafc5b8d
5 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/arch/i386/interface/syslinux/comboot_call.c
View File

@@ -157,7 +157,7 @@ void comboot_force_text_mode ( void ) {
* Fetch kernel and optional initrd
*/
static int comboot_fetch_kernel ( char *kernel_file, char *cmdline ) {
struct image *kernel;
struct image *kernel = NULL;
struct image *initrd = NULL;
char *initrd_file;
int rc;
@@ -181,13 +181,13 @@ static int comboot_fetch_kernel ( char *kernel_file, char *cmdline ) {
if ( ! initrd ) {
DBG ( "COMBOOT: could not allocate initrd\n" );
rc = -ENOMEM;
goto err_alloc_initrd;
goto out;
}
if ( ( rc = imgfetch ( initrd, initrd_file,
register_image ) ) != 0 ) {
DBG ( "COMBOOT: could not fetch initrd: %s\n",
strerror ( rc ) );
goto err_fetch_initrd;
goto out;
}
/* Restore space after initrd name, if applicable */
@@ -202,32 +202,31 @@ static int comboot_fetch_kernel ( char *kernel_file, char *cmdline ) {
if ( ! kernel ) {
DBG ( "COMBOOT: could not allocate kernel\n" );
rc = -ENOMEM;
goto err_alloc_kernel;
goto out;
}
if ( ( rc = imgfetch ( kernel, kernel_file,
register_image ) ) != 0 ) {
DBG ( "COMBOOT: could not fetch kernel: %s\n",
strerror ( rc ) );
goto err_fetch_kernel;
goto out;
}
if ( ( rc = image_set_cmdline ( kernel, cmdline ) ) != 0 ) {
DBG ( "COMBOOT: could not set kernel command line: %s\n",
strerror ( rc ) );
goto err_set_cmdline;
goto out;
}
/* Store kernel as replacement image */
comboot_replacement_image = kernel;
assert ( comboot_replacement_image == NULL );
comboot_replacement_image = image_get ( kernel );
return 0;
err_set_cmdline:
err_fetch_kernel:
out:
/* Drop image references unconditionally; either we want to
* discard them, or they have been registered and we should
* drop out local reference.
*/
image_put ( kernel );
err_alloc_kernel:
err_fetch_initrd:
image_put ( initrd );
err_alloc_initrd:
return rc;
}