From: Petr Vorel <pvorel@suse.cz>
To: Mimi Zohar <zohar@linux.ibm.com>
Cc: linux-integrity@vger.kernel.org, linux-kselftest@vger.kernel.org,
kexec@lists.infradead.org, linux-kernel@vger.kernel.org,
Dave Young <dyoung@redhat.com>,
Matthew Garrett <mjg59@google.com>
Subject: Re: [PATCH] selftests/kexec: update get_secureboot_mode
Date: Fri, 5 Apr 2019 14:47:51 +0200 [thread overview]
Message-ID: <20190405124751.GA26595@dell5510> (raw)
In-Reply-To: <1554300369.7309.59.camel@linux.ibm.com>
Hi Mimi,
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Some minor comments below.
...
> diff --git a/tools/testing/selftests/kexec/kexec_common_lib.sh b/tools/testing/selftests/kexec/kexec_common_lib.sh
...
> # Check efivar SecureBoot-$(the UUID) and SetupMode-$(the UUID).
> +# (Based on kdump-lib.sh)
> +get_efivarfs_secureboot_mode()
> +{
> + local efivarfs="/sys/firmware/efi/efivars"
> + local secure_boot_file=""
> + local setup_mode_file=""
> + local secureboot_mode=0
> + local setup_mode=0
NOTE: variables does not need to be initialized (in both functions).
> +
> + # Make sure that efivar_fs is mounted in the normal location
> + if ! grep -q "^\S\+ $efivarfs efivarfs" /proc/mounts; then
> + log_info "efivars is not mounted on $efivarfs"
> + return 0;
> + fi
> + secure_boot_file=$(find "$efivarfs" -name SecureBoot-* 2>/dev/null)
> + setup_mode_file=$(find "$efivarfs" -name SetupMode-* 2>/dev/null)
> + if [ -f "$secure_boot_file" ] && [ -f "$setup_mode_file" ]; then
> + secureboot_mode=$(hexdump -v -e '/1 "%d\ "' \
> + "$secure_boot_file"|cut -d' ' -f 5)
> + setup_mode=$(hexdump -v -e '/1 "%d\ "' \
> + "$setup_mode_file"|cut -d' ' -f 5)
> +
> + if [ $secureboot_mode -eq 1 ] && [ $setup_mode -eq 0 ]; then
> + log_info "secure boot mode enabled (efivar_fs)"
Instead of efivar_fs maybe CONFIG_EFIVAR_FS or EFIVAR_FS?
> + return 1;
> + fi
> + fi
> + return 0;
> +}
> +
> +get_efi_var_secureboot_mode()
> +{
> + local efi_vars="/sys/firmware/efi/vars"
> + local secure_boot_file=""
> + local setup_mode_file=""
> + local secureboot_mode=0
> + local setup_mode=0
> +
> + if [ ! -d "$efi_vars" ]; then
> + log_skip "efi_vars is not enabled\n"
> + return 0;
Return is not needed (log_skip exits).
> + fi
> + secure_boot_file=$(find "$efi_vars" -name SecureBoot-* 2>/dev/null)
> + setup_mode_file=$(find "$efi_vars" -name SetupMode-* 2>/dev/null)
> + if [ -f "$secure_boot_file/data" ] && \
> + [ -f "$setup_mode_file/data" ]; then
> + secureboot_mode=`od -An -t u1 "$secure_boot_file/data"`
> + setup_mode=`od -An -t u1 "$setup_mode_file/data"`
> +
> + if [ $secureboot_mode -eq 1 ] && [ $setup_mode -eq 0 ]; then
> + log_info "secure boot mode enabled (efi_var)"
Instead of efi_var maybe CONFIG_EFI_VARS or EFI_VARS?
...
Kind regards,
Petr
next prev parent reply other threads:[~2019-04-05 12:47 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-26 13:34 [PATCH v5 0/9] selftests/kexec: add kexec tests Mimi Zohar
2019-03-26 13:34 ` [PATCH v5 1/9] selftests/kexec: move the IMA kexec_load selftest to selftests/kexec Mimi Zohar
2019-03-27 11:54 ` Petr Vorel
2019-03-26 13:34 ` [PATCH v5 2/9] selftests/kexec: cleanup the kexec selftest Mimi Zohar
2019-03-26 13:34 ` [PATCH v5 3/9] selftests/kexec: define a set of common functions Mimi Zohar
2019-03-26 13:34 ` [PATCH v5 4/9] selftests/kexec: define common logging functions Mimi Zohar
2019-03-26 13:34 ` [PATCH v5 5/9] kselftest/kexec: define "require_root_privileges" Mimi Zohar
2019-03-26 13:34 ` [PATCH v5 6/9] selftests/kexec: kexec_file_load syscall test Mimi Zohar
2019-03-26 13:34 ` [PATCH v5 7/9] selftests/kexec: Add missing '=y' to config options Mimi Zohar
2019-03-26 13:34 ` [PATCH v5 8/9] selftests/kexec: check kexec_load and kexec_file_load are enabled Mimi Zohar
2019-03-27 11:53 ` Petr Vorel
2019-03-26 13:34 ` [PATCH v5 9/9] selftests/kexec: make kexec_load test independent of IMA being enabled Mimi Zohar
2019-03-27 11:56 ` Petr Vorel
2019-04-03 14:06 ` [PATCH] selftests/kexec: update get_secureboot_mode Mimi Zohar
2019-04-05 12:47 ` Petr Vorel [this message]
2019-04-05 18:35 ` Mimi Zohar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190405124751.GA26595@dell5510 \
--to=pvorel@suse.cz \
--cc=dyoung@redhat.com \
--cc=kexec@lists.infradead.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mjg59@google.com \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).