diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2021-11-23 10:19:57 +1100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-24 07:37:36 +0000 |
| commit | 0457e74c956b320e1ed24fee469f951521a3e18a (patch) | |
| tree | 5532e011de513feff41591ffaf70b30b3162c34a | |
| parent | 483dff64346fd30224df5b66bf76124aeea7bb12 (diff) | |
| download | vboot-0457e74c956b320e1ed24fee469f951521a3e18a.tar.gz | |
futility: always create a tempfile in updater_apply_white_label()
Fix updater_apply_white_label() to not assume "<none>" is
a valid file path. Also remove a redundant duplication of
a error branch.
BUG=b:203715651
BRANCH=none
TEST=builds
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Change-Id: I373d6fac4210e2055f9717e2266e9e2820c40f45
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3295886
Tested-by: Edward O'Callaghan <quasisec@chromium.org>
Auto-Submit: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Sam McNally <sammc@chromium.org>
Commit-Queue: Edward O'Callaghan <quasisec@chromium.org>
| -rw-r--r-- | futility/updater.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/futility/updater.c b/futility/updater.c index 87ac6fd8..e8fd84e2 100644 --- a/futility/updater.c +++ b/futility/updater.c @@ -1376,17 +1376,13 @@ static int updater_apply_white_label(struct updater_config *cfg, assert(model->is_white_label); if (!signature_id) { - if (cfg->image_current.data) { - tmp_image = get_firmware_image_temp_file( - &cfg->image_current, &cfg->tempfiles); - if (!tmp_image) - return 1; - } else { + if (!cfg->image_current.data) { INFO("Loading system firmware for white label...\n"); load_system_firmware(&cfg->image_current, &cfg->tempfiles, cfg->verbosity); - tmp_image = cfg->image_current.file_name; } + tmp_image = get_firmware_image_temp_file( + &cfg->image_current, &cfg->tempfiles); if (!tmp_image) { ERROR("Failed to get system current firmware\n"); return 1; |