X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=2a0d333a4ea7bad7c9249764f119767c2228a0ba;hp=ba4e7208fc7cf700a86c87fad4a8b5e4f092e375;hb=917f7aa880a7c6ab08991ae0c969d0489ba48845;hpb=3a76e4214d5ca666e1d2d6c74e84309064c8a3ab

diff --git a/discover/boot.c b/discover/boot.c
index ba4e720..2a0d333 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -26,7 +26,7 @@
 #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 {
@@ -72,17 +72,17 @@ static int kexec_load(struct boot_task *boot_task)
 	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) ?
@@ -144,7 +144,7 @@ static int kexec_load(struct boot_task *boot_task)
 	}
 
 abort_kexec:
-	gpg_validate_boot_files_cleanup(boot_task);
+	validate_boot_files_cleanup(boot_task);
 
 	return result;
 }
@@ -324,7 +324,7 @@ static void run_boot_hooks(struct boot_task *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,
@@ -362,15 +362,14 @@ static void cleanup_load(struct load_url_result *result)
 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;
 
@@ -378,9 +377,6 @@ static void cleanup_cancellations(struct boot_task *task,
 		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) {
@@ -401,6 +397,7 @@ static void cleanup_cancellations(struct boot_task *task,
 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) {
@@ -408,65 +405,14 @@ static void boot_process(struct load_url_result *result, void *data)
 		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))
+	list_for_each_entry(&task->resources, resource, list)
+		if (load_pending(resource->result))
 			return;
-	}
-	if (task->decrypt_files) {
-		if (load_pending(task->cmdline_signature))
-			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);
@@ -491,18 +437,9 @@ static void boot_process(struct load_url_result *result, void *data)
 				_("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,
@@ -517,22 +454,43 @@ no_load:
 	}
 }
 
-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, NULL,
-				 task->status_arg);
-	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)
@@ -540,6 +498,7 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 	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;
@@ -588,6 +547,7 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 	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);
@@ -623,36 +583,48 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 		}
 	}
 
+	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. */