#include "resource.h"
#include "platform.h"
-#include <security/gpg.h>
+#include <security/security.h>
static const char *boot_hook_dir = PKG_SYSCONF_DIR "/boot.d";
enum {
BOOT_HOOK_EXIT_UPDATE = 2,
};
+static void __attribute__((format(__printf__, 4, 5))) update_status(
+ boot_status_fn fn, void *arg, int type, char *fmt, ...)
+{
+ struct status status;
+ va_list ap;
+
+ va_start(ap, fmt);
+ status.message = talloc_vasprintf(NULL, fmt, ap);
+ va_end(ap);
+
+ status.type = type;
+ status.backlog = false;
+
+ pb_debug("boot status: [%d] %s\n", type, status.message);
+
+ fn(arg, &status);
+
+ talloc_free(status.message);
+}
+
/**
* kexec_load - kexec load helper.
*/
static int kexec_load(struct boot_task *boot_task)
{
- int result;
- const char *argv[7];
- const char **p;
+ struct process *process;
char *s_initrd = NULL;
- char *s_dtb = NULL;
char *s_args = NULL;
+ const char *argv[7];
+ char *s_dtb = NULL;
+ const char **p;
+ int result;
+
boot_task->local_initrd_override = NULL;
boot_task->local_dtb_override = NULL;
boot_task->local_image_override = NULL;
- if ((result = gpg_validate_boot_files(boot_task))) {
+ if ((result = validate_boot_files(boot_task))) {
if (result == KEXEC_LOAD_DECRYPTION_FALURE) {
pb_log("%s: Aborting kexec due to"
" decryption failure\n", __func__);
- goto abort_kexec;
}
if (result == KEXEC_LOAD_SIGNATURE_FAILURE) {
pb_log("%s: Aborting kexec due to signature"
" verification failure\n", __func__);
- goto abort_kexec;
}
+
+ goto abort_kexec;
}
const char* local_initrd = (boot_task->local_initrd_override) ?
const char* local_image = (boot_task->local_image_override) ?
boot_task->local_image_override : boot_task->local_image;
+ process = process_create(boot_task);
+ if (!process) {
+ pb_log("%s: failed to create process\n", __func__);
+ return -1;
+ }
+
+ process->path = pb_system_apps.kexec;
+ process->argv = argv;
+ process->keep_stdout = true;
+ process->add_stderr = true;
+
p = argv;
*p++ = pb_system_apps.kexec; /* 1 */
*p++ = "-l"; /* 2 */
*p++ = local_image; /* 6 */
*p++ = NULL; /* 7 */
- result = process_run_simple_argv(boot_task, argv);
+ result = process_run_sync(process);
+ if (result) {
+ pb_log("%s: failed to run process\n", __func__);
+ goto abort_kexec;
+ }
- if (result)
+ result = process->exit_status;
+
+ if (result) {
pb_log("%s: failed: (%d)\n", __func__, result);
+ update_status(boot_task->status_fn, boot_task->status_arg,
+ STATUS_ERROR, "%s", process->stdout_buf);
+ }
abort_kexec:
- gpg_validate_boot_files_cleanup(boot_task);
+ validate_boot_files_cleanup(boot_task);
return result;
}
return result;
}
-static void __attribute__((format(__printf__, 4, 5))) update_status(
- boot_status_fn fn, void *arg, int type, char *fmt, ...)
-{
- struct status status;
- va_list ap;
-
- va_start(ap, fmt);
- status.message = talloc_vasprintf(NULL, fmt, ap);
- va_end(ap);
-
- status.type = type;
-
- pb_debug("boot status: [%d] %s\n", type, status.message);
-
- fn(arg, &status);
-
- talloc_free(status.message);
-}
-
static void boot_hook_update_param(void *ctx, struct boot_task *task,
const char *name, const char *value)
{
return;
update_status(task->status_fn, task->status_arg, STATUS_INFO,
- _("running boot hooks"));
+ _("Running boot hooks"));
boot_hook_setenv(task);
static bool load_pending(struct load_url_result *result)
{
- return result && result->status == LOAD_ASYNC;
+ return !result || result->status == LOAD_ASYNC;
}
static int check_load(struct boot_task *task, const char *name,
{
if (!result)
return 0;
- if (result->status != LOAD_ERROR)
+
+ if (result->status != LOAD_ERROR) {
+ update_status(task->status_fn, task->status_arg,
+ STATUS_ERROR,
+ _("Loaded %s from %s"), name,
+ pb_url_to_string(result->url));
return 0;
+ }
update_status(task->status_fn, task->status_arg,
STATUS_ERROR,
- _("Couldn't load %s"), name);
+ _("Couldn't load %s from %s"), name,
+ pb_url_to_string(result->url));
return -1;
}
static void cleanup_cancellations(struct boot_task *task,
struct load_url_result *cur_result)
{
- struct load_url_result *result, **results[] = {
- &task->image, &task->initrd, &task->dtb,
- };
+ struct boot_resource *resource;
+ struct load_url_result *result;
bool pending = false;
- unsigned int i;
- for (i = 0; i < ARRAY_SIZE(results); i++) {
- result = *results[i];
+ list_for_each_entry(&task->resources, resource, list) {
+ result = resource->result;
+ /* Nothing to do if a load hasn't actually started yet */
if (!result)
continue;
if (result == cur_result || result->status == LOAD_OK
|| result->status == LOAD_ERROR) {
cleanup_load(result);
- talloc_free(result);
- *results[i] = NULL;
-
/* ... and cancel any pending loads, which we'll free in
* the completion callback */
} else if (result->status == LOAD_ASYNC) {
static void boot_process(struct load_url_result *result, void *data)
{
struct boot_task *task = data;
+ struct boot_resource *resource;
int rc = -1;
if (task->cancelled) {
return;
}
- if (load_pending(task->image) ||
- load_pending(task->initrd) ||
- load_pending(task->dtb))
- return;
-
- if (check_load(task, "kernel image", task->image) ||
- check_load(task, "initrd", task->initrd) ||
- check_load(task, "dtb", task->dtb))
- goto no_load;
-
- if (task->verify_signature) {
- if (load_pending(task->image_signature) ||
- load_pending(task->initrd_signature) ||
- load_pending(task->dtb_signature) ||
- load_pending(task->cmdline_signature))
- return;
- }
- if (task->decrypt_files) {
- if (load_pending(task->cmdline_signature))
+ list_for_each_entry(&task->resources, resource, list)
+ if (load_pending(resource->result))
return;
- }
- if (task->verify_signature) {
- if (check_load(task, "kernel image signature",
- task->image_signature) ||
- check_load(task, "initrd signature",
- task->initrd_signature) ||
- check_load(task, "dtb signature",
- task->dtb_signature) ||
- check_load(task, "command line signature",
- task->cmdline_signature))
- goto no_sig_load;
- }
- if (task->decrypt_files) {
- if (load_pending(task->cmdline_signature))
- return;
-
- if (check_load(task, "command line signature",
- task->cmdline_signature))
- goto no_decrypt_sig_load;
- }
-
- /* we make a copy of the local paths, as the boot hooks might update
- * and/or create these */
- task->local_image = task->image ? task->image->local : NULL;
- task->local_initrd = task->initrd ? task->initrd->local : NULL;
- task->local_dtb = task->dtb ? task->dtb->local : NULL;
-
- if (task->verify_signature) {
- task->local_image_signature = task->image_signature ?
- task->image_signature->local : NULL;
- task->local_initrd_signature = task->initrd_signature ?
- task->initrd_signature->local : NULL;
- task->local_dtb_signature = task->dtb_signature ?
- task->dtb_signature->local : NULL;
- }
- if (task->verify_signature || task->decrypt_files) {
- task->local_cmdline_signature = task->cmdline_signature ?
- task->cmdline_signature->local : NULL;
+ list_for_each_entry(&task->resources, resource, list) {
+ if (check_load(task, resource->name, resource->result))
+ goto no_load;
+ *resource->local_path = resource->result->local;
}
run_boot_hooks(task);
update_status(task->status_fn, task->status_arg, STATUS_INFO,
- _("performing kexec_load"));
+ _("Performing kexec load"));
rc = kexec_load(task);
+ pb_log("%s: kexec_load returned %d\n", __func__, rc);
if (rc == KEXEC_LOAD_DECRYPTION_FALURE) {
update_status(task->status_fn, task->status_arg,
- STATUS_ERROR, _("decryption failed"));
+ STATUS_ERROR, _("Decryption failed"));
}
else if (rc == KEXEC_LOAD_SIGNATURE_FAILURE) {
update_status(task->status_fn, task->status_arg,
STATUS_ERROR,
- _("signature verification failed"));
+ _("Signature verification failed"));
}
else if (rc == KEXEC_LOAD_SIG_SETUP_INVALID) {
update_status(task->status_fn, task->status_arg,
STATUS_ERROR,
- _("invalid signature configuration"));
- }
- else if (rc) {
- update_status(task->status_fn, task->status_arg,
- STATUS_ERROR, _("kexec load failed"));
+ _("Invalid signature configuration"));
}
-no_sig_load:
- cleanup_load(task->image_signature);
- cleanup_load(task->initrd_signature);
- cleanup_load(task->dtb_signature);
-
-no_decrypt_sig_load:
- cleanup_load(task->cmdline_signature);
-
no_load:
- cleanup_load(task->image);
- cleanup_load(task->initrd);
- cleanup_load(task->dtb);
+ list_for_each_entry(&task->resources, resource, list)
+ cleanup_load(resource->result);
if (!rc) {
update_status(task->status_fn, task->status_arg,
- STATUS_INFO, _("performing kexec reboot"));
+ STATUS_INFO, _("Performing kexec reboot"));
rc = kexec_reboot(task);
if (rc) {
}
}
-static int start_url_load(struct boot_task *task, const char *name,
- struct pb_url *url, struct load_url_result **result)
+static int start_url_load(struct boot_task *task, struct boot_resource *res)
{
- if (!url)
+ if (!res)
return 0;
- *result = load_url_async(task, url, boot_process, task);
- if (!*result) {
+ res->result = load_url_async(task, res->url, boot_process,
+ task, NULL, task->status_arg);
+ if (!res->result) {
update_status(task->status_fn, task->status_arg,
- STATUS_ERROR, _("Error loading %s"), name);
+ STATUS_ERROR, _("Error loading %s"),
+ res->name);
return -1;
}
return 0;
}
+static struct boot_resource *add_boot_resource(struct boot_task *task,
+ const char *name, struct pb_url *url,
+ const char **local_path)
+{
+ struct boot_resource *res;
+
+ if (!url)
+ return NULL;
+
+ res = talloc_zero(task, struct boot_resource);
+ if (!res)
+ return NULL;
+
+ res->name = talloc_strdup(res, name);
+ res->url = pb_url_copy(res, url);
+ res->local_path = local_path;
+
+ list_add(&task->resources, &res->list);
+ return res;
+}
+
struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
struct boot_command *cmd, int dry_run,
boot_status_fn status_fn, void *status_arg)
struct pb_url *image = NULL, *initrd = NULL, *dtb = NULL;
struct pb_url *image_sig = NULL, *initrd_sig = NULL, *dtb_sig = NULL,
*cmdline_sig = NULL;
+ struct boot_resource *image_res, *initrd_res, *dtb_res, *tmp;
const struct config *config = config_get();
struct boot_task *boot_task;
const char *boot_desc;
boot_desc = _("(unknown)");
update_status(status_fn, status_arg, STATUS_INFO,
- _("Booting %s."), boot_desc);
+ _("Booting %s"), boot_desc);
if (cmd && cmd->boot_image_file) {
image = pb_url_parse(opt, cmd->boot_image_file);
dtb = opt->dtb->url;
}
+ if (opt && opt->proxy) {
+ setenv("http_proxy", opt->proxy, 1);
+ setenv("https_proxy", opt->proxy, 1);
+ }
+
boot_task = talloc_zero(ctx, struct boot_task);
boot_task->dry_run = dry_run;
boot_task->status_fn = status_fn;
boot_task->status_arg = status_arg;
+ list_init(&boot_task->resources);
lockdown_type = lockdown_status();
boot_task->verify_signature = (lockdown_type == PB_LOCKDOWN_SIGN);
}
}
+ image_res = add_boot_resource(boot_task, _("kernel image"), image,
+ &boot_task->local_image);
+ initrd_res = add_boot_resource(boot_task, _("initrd"), initrd,
+ &boot_task->local_initrd);
+ dtb_res = add_boot_resource(boot_task, _("dtb"), dtb,
+ &boot_task->local_dtb);
+
/* start async loads for boot resources */
- rc = start_url_load(boot_task, "kernel image", image, &boot_task->image)
- || start_url_load(boot_task, "initrd", initrd, &boot_task->initrd)
- || start_url_load(boot_task, "dtb", dtb, &boot_task->dtb);
+ rc = start_url_load(boot_task, image_res)
+ || start_url_load(boot_task, initrd_res)
+ || start_url_load(boot_task, dtb_res);
if (boot_task->verify_signature) {
/* Generate names of associated signature files and load */
if (image) {
- image_sig = gpg_get_signature_url(ctx, image);
- rc |= start_url_load(boot_task,
- "kernel image signature", image_sig,
- &boot_task->image_signature);
+ image_sig = get_signature_url(ctx, image);
+ tmp = add_boot_resource(boot_task,
+ _("kernel image signature"), image_sig,
+ &boot_task->local_image_signature);
+ rc |= start_url_load(boot_task, tmp);
}
if (initrd) {
- initrd_sig = gpg_get_signature_url(ctx, initrd);
- rc |= start_url_load(boot_task, "initrd signature",
- initrd_sig, &boot_task->initrd_signature);
+ initrd_sig = get_signature_url(ctx, initrd);
+ tmp = add_boot_resource(boot_task,
+ _("initrd signature"), initrd_sig,
+ &boot_task->local_initrd_signature);
+ rc |= start_url_load(boot_task, tmp);
}
if (dtb) {
- dtb_sig = gpg_get_signature_url(ctx, dtb);
- rc |= start_url_load(boot_task, "dtb signature",
- dtb_sig, &boot_task->dtb_signature);
+ dtb_sig = get_signature_url(ctx, dtb);
+ tmp = add_boot_resource(boot_task,
+ _("dtb signature"), dtb_sig,
+ &boot_task->local_dtb_signature);
+ rc |= start_url_load(boot_task, tmp);
}
}
if (boot_task->verify_signature || boot_task->decrypt_files) {
- rc |= start_url_load(boot_task,
- "kernel command line signature", cmdline_sig,
- &boot_task->cmdline_signature);
+ tmp = add_boot_resource(boot_task,
+ _("kernel command line signature"), cmdline_sig,
+ &boot_task->local_cmdline_signature);
+ rc |= start_url_load(boot_task, tmp);
}
/* If all URLs are local, we may be done. */
projects / petitboot / blobdiff