diff options
| author | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2018-03-06 16:44:44 +1100 |
|---|---|---|
| committer | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2018-03-07 16:24:31 +1100 |
| commit | c208aa42024fddc74682742bec12735e432a5510 (patch) | |
| tree | c6b16cc68f5813f9a2b3cfea1d2119885d829598 /discover/boot.c | |
| parent | 47d0601affe80d7f98a2053749f5e1d479f902f4 (diff) | |
| download | talos-petitboot-c208aa42024fddc74682742bec12735e432a5510.tar.gz talos-petitboot-c208aa42024fddc74682742bec12735e432a5510.zip | |
discover/boot: Fix stale boot cancellation codev1.7.1
In dc85de97 "Allow load_async_url() to call callback for local paths"
several load_url_result fields of the boot_task struct were deprecated
but were accidentally left in the struct. This caused the now out of
date code in cleanup_cancellations() to go unnoticed since it can return
safely if these fields are NULL. However freeing the boot task can free
the memory associated with each load before it is complete, resulting in
a confusing segfault.
This brings cleanup_cancellations() up to date and along the way
implicitly includes the signature resources in cleanup which were missed
originally.
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Diffstat (limited to 'discover/boot.c')
| -rw-r--r-- | discover/boot.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/discover/boot.c b/discover/boot.c index 1e010ab..0da40e3 100644 --- a/discover/boot.c +++ b/discover/boot.c @@ -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) { |
