From d9a6fb3ccff1df28967df1015ab9bf4c47d617db Mon Sep 17 00:00:00 2001 From: Eduard Shishkin Date: Fri, 4 Nov 2022 14:13:38 +0100 Subject: [PATCH] zipl/src: fix secure boot status check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Set up the secure_boot_supported global variable at the function bootmap_create() instead of bootmap_create_device() to make sure that the secure boot status is checked for all relevant jobs. Fixes: 7b369318ddcf ("zipl: check for secure boot once") Signed-off-by: Eduard Shishkin Reviewed-by: Jan Höppner Signed-off-by: Jan Höppner --- zipl/src/bootmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zipl/src/bootmap.c b/zipl/src/bootmap.c index 27620c8d..349b844c 100644 --- a/zipl/src/bootmap.c +++ b/zipl/src/bootmap.c @@ -1331,8 +1331,6 @@ bootmap_create_device(struct job_data *job, disk_blockptr_t *program_table, ulong unused_size; int fd; - secure_boot_supported = check_secure_boot_support(); - /* Get full path of bootmap file */ if (!dry_run) { filename = misc_strdup(job->data.dump.device); @@ -1651,6 +1649,8 @@ bootmap_create(struct job_data *job, disk_blockptr_t *program_table, disk_blockptr_t **stage1b_list, blocknum_t *stage1b_count, char **new_device, struct disk_info **new_info) { + secure_boot_supported = check_secure_boot_support(); + if (job->id == job_dump_partition) { if (is_ngdump_enabled(job->data.dump.device, &job->target)) return bootmap_create_device_ngdump(job, program_table,