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

buffer network files. Fix incorrect net_fini_hw and unregister calls

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-07-06 13:13:45 +02:00
parent b975df6348
commit 1c3fcdee15
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
grub-core/net/net.c
View file

@ -32,6 +32,7 @@
#include <grub/net/ethernet.h> #include <grub/net/ethernet.h>
#include <grub/datetime.h> #include <grub/datetime.h>
#include <grub/loader.h> #include <grub/loader.h>
#include <grub/bufio.h>
GRUB_MOD_LICENSE ("GPLv3+"); GRUB_MOD_LICENSE ("GPLv3+");
@ -709,15 +710,36 @@ grub_net_fs_dir (grub_device_t device, const char *path __attribute__ ((unused))
} }
static grub_err_t static grub_err_t
grub_net_fs_open (struct grub_file *file, const char *name) grub_net_fs_open (struct grub_file *file_out, const char *name)
{ {
grub_err_t err;
struct grub_file *file, *bufio;
file = grub_malloc (sizeof (*file));
if (!file)
return grub_errno;
grub_memcpy (file, file_out, sizeof (struct grub_file));
file->device->net->packs.first = NULL; file->device->net->packs.first = NULL;
file->device->net->packs.last = NULL; file->device->net->packs.last = NULL;
file->device->net->name = grub_strdup (name); file->device->net->name = grub_strdup (name);
if (!file->device->net->name) if (!file->device->net->name)
return grub_errno; return grub_errno;
return file->device->net->protocol->open (file, name); err = file->device->net->protocol->open (file, name);
if (err)
return err;
bufio = grub_bufio_open (file, 32768);
if (! bufio)
{
file->device->net->protocol->close (file);
grub_free (file->device->net->name);
grub_free (file);
return grub_errno;
}
grub_memcpy (file_out, bufio, sizeof (struct grub_file));
return GRUB_ERR_NONE;
} }
static grub_err_t static grub_err_t
@ -1430,8 +1452,6 @@ GRUB_MOD_INIT(net)
fini_hnd = grub_loader_register_preboot_hook (grub_net_fini_hw, fini_hnd = grub_loader_register_preboot_hook (grub_net_fini_hw,
grub_net_restore_hw, grub_net_restore_hw,
GRUB_LOADER_PREBOOT_HOOK_PRIO_DISK); GRUB_LOADER_PREBOOT_HOOK_PRIO_DISK);
grub_net_fini_hw (0);
grub_loader_unregister_preboot_hook (fini_hnd);
} }
GRUB_MOD_FINI(net) GRUB_MOD_FINI(net)
@ -1446,5 +1466,6 @@ GRUB_MOD_FINI(net)
grub_unregister_command (cmd_getdhcp); grub_unregister_command (cmd_getdhcp);
grub_fs_unregister (&grub_net_fs); grub_fs_unregister (&grub_net_fs);
grub_net_open = NULL; grub_net_open = NULL;
grub_net_fini_hw (0);
grub_loader_unregister_preboot_hook (fini_hnd); grub_loader_unregister_preboot_hook (fini_hnd);
} }