From: Petr Vorel <pvorel@suse.cz>
To: Mimi Zohar <zohar@linux.ibm.com>
Cc: linux-kselftest@vger.kernel.org, Shuah Khan <shuah@kernel.org>,
linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 4/5] selftests/ima: kexec_file_load syscall test
Date: Thu, 28 Feb 2019 23:00:39 +0100 [thread overview]
Message-ID: <20190228220039.GC20335@dell5510> (raw)
In-Reply-To: <1551223620-11586-5-git-send-email-zohar@linux.ibm.com>
Hi Mimi,
> The kernel can be configured to verify PE signed kernel images, IMA
> kernel image signatures, both types of signatures, or none. This test
> verifies only properly signed kernel images are loaded into memory,
> based on the kernel configuration and runtime policies.
> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
LGTM, minor comments below.
...
> +++ b/tools/testing/selftests/ima/common_lib.sh
...
> +# Look for config option in Kconfig file.
> +# Return 1 for found and 0 for not found.
> +kconfig_enabled()
> +{
> + local config="$1"
> + local msg="$2"
> +
Mixing tabs and spaces (spaces below).
> + grep -E -q $config $IKCONFIG
> + if [ $? -eq 0 ]; then
> + log_info "$msg"
> + return 1
> + fi
> + return 0
> +}
> +
> +# Attempt to get the kernel config first via proc, and then by
> +# extracting it from the kernel image or the configs.ko using
> +# scripts/extract-ikconfig.
> +# Return 1 for found and 0 for not found.
> +get_kconfig()
> +{
> + local proc_config="/proc/config.gz"
> + local module_dir="/lib/modules/`uname -r`"
> + local configs_module="$module_dir/kernel/kernel/configs.ko"
> +
> + if [ ! -f $proc_config ]; then
> + modprobe configs > /dev/null 2>&1
> + fi
> + if [ -f $proc_config ]; then
> + cat $proc_config | gunzip > $IKCONFIG 2>/dev/null
> + if [ $? -eq 0 ]; then
> + return 1
> + fi
> + fi
> +
> + local extract_ikconfig="$module_dir/source/scripts/extract-ikconfig"
> + if [ ! -f $extract_ikconfig ]; then
> + log_skip "extract-ikconfig not found"
> + fi
> +
> + $extract_ikconfig $KERNEL_IMAGE > $IKCONFIG 2>/dev/null
> + if [ $? -eq 1 ]; then
> + if [ ! -f $configs_module ]; then
> + log_skip "CONFIG_IKCONFIG not enabled"
> + fi
> + $extract_ikconfig $configs_module > $IKCONFIG
> + if [ $? -eq 1 ]; then
> + log_skip "CONFIG_IKCONFIG not enabled"
> + fi
> + fi
> + return 1
> +}
> +
> +# Make sure that securityfs is mounted
> +mount_securityfs()
> +{
> + if [ -z $SECURITYFS ]; then
> + SECURITYFS=/sys/kernel/security
> + mount -t securityfs security $SECURITYFS
> + fi
> +
> + if [ ! -d "$SECURITYFS" ]; then
> + log_fail "$SECURITYFS :securityfs is not mounted"
log_fail "$SECURITYFS: securityfs is not mounted"
> + fi
> +}
> +
> +# The policy rule format is an "action" followed by key-value pairs. This
> +# function supports up to two key-value pairs, in any order.
> +# For example: action func=<keyword> [appraise_type=<type>]
> +# Return 1 for found and 0 for not found.
> +check_ima_policy()
> +{
> + local action=$1
local action="$1"
(sorry this is nitpicking, I'd be consistent)
> + local keypair1="$2"
> + local keypair2="$3"
> +
> + mount_securityfs
> +
> + local ima_policy=$SECURITYFS/ima/policy
> + if [ ! -e $ima_policy ]; then
> + log_fail "$ima_policy not found"
> + fi
> +
> + if [ -n $keypair2 ]; then
> + grep -e "^$action.*$keypair1" "$ima_policy" | \
> + grep -q -e "$keypair2"
> + else
> + grep -q -e "^$action.*$keypair1" "$ima_policy"
> + fi
> +
> + [ $? -eq 0 ] && ret=1 || ret=0
> + return $ret
return $? is enough here (+ ret was not defined as local and mixing tabs with spaces)
> +}
> diff --git a/tools/testing/selftests/ima/test_kexec_file_load.sh b/tools/testing/selftests/ima/test_kexec_file_load.sh
> new file mode 100755
> index 000000000000..e08c7e6cf28c
> --- /dev/null
> +++ b/tools/testing/selftests/ima/test_kexec_file_load.sh
...
> + # The architecture specific or a custom policy may require the
> + # kexec kernel image be signed. Policy rules are walked
> + # sequentially. As a result, a policy rule may be defined, but
> + # might not necessarily be used. This test assumes if a policy
> + # rule is specified, that is the intent.
> + if [ $ima_read_policy -eq 1 ]; then
> + check_ima_policy "appraise" "func=KEXEC_KERNEL_CHECK" \
> + "appraise_type=imasig"
> + ret=$?
> + [ $ret -eq 1 ] && log_info "IMA signature required";
> + fi
> + return $ret
> +}
> +
> +# The kexec_file_load_test() is complicated enough, require pesign.
> +# Return 1 for PE signature found and 0 for not found.
> +check_for_pesig()
> +{
> + which pesign > /dev/null 2>&1
> + if [ $? -eq 1 ]; then
> + log_skip "pesign not found"
> + fi
Maybe just (matter of preference)
which pesign > /dev/null 2>&1 || log_skip "pesign not found"
> +
> + pesign -i $KERNEL_IMAGE --show-signature | grep -q "No signatures"
> + local ret=$?
> + if [ $ret -eq 1 ]; then
> + log_info "kexec kernel image PE signed"
> + else
> + log_info "kexec kernel image not PE signed"
> + fi
> + return $ret
> +}
...
> +# kexec requires root privileges
> +if [ $(id -ru) -ne 0 ]; then
> + log_skip "requires root privileges"
> +fi
This is repeated several times => good candidate for helper even here in IMA
specific library.
Kind regards,
Petr
next prev parent reply other threads:[~2019-02-28 22:00 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-26 23:26 [PATCH v2 0/5] selftests/ima: add kexec and kernel module tests Mimi Zohar
2019-02-26 23:26 ` [PATCH v2 1/5] selftests/ima: cleanup the kexec selftest Mimi Zohar
2019-02-27 0:57 ` shuah
2019-02-26 23:26 ` [PATCH v2 2/5] selftests/ima: define a set of common functions Mimi Zohar
2019-02-27 1:01 ` shuah
2019-02-28 19:54 ` Petr Vorel
2019-02-26 23:26 ` [PATCH v2 3/5] selftests/ima: define common logging functions Mimi Zohar
2019-02-27 1:39 ` shuah
2019-02-28 20:18 ` Petr Vorel
2019-02-28 21:01 ` Petr Vorel
2019-02-26 23:26 ` [PATCH v2 4/5] selftests/ima: kexec_file_load syscall test Mimi Zohar
2019-02-27 1:54 ` shuah
2019-02-28 22:00 ` Petr Vorel [this message]
2019-03-10 17:48 ` Mimi Zohar
2019-03-11 8:34 ` Petr Vorel
2019-03-11 11:49 ` Mimi Zohar
2019-02-28 22:20 ` Petr Vorel
2019-02-26 23:27 ` [PATCH v2 5/5] selftests/ima: loading kernel modules Mimi Zohar
2019-02-27 1:59 ` shuah
2019-02-27 14:14 ` Mimi Zohar
2019-02-27 15:33 ` shuah
2019-02-27 18:37 ` Mimi Zohar
2019-02-28 23:14 ` Petr Vorel
2019-02-28 22:32 ` Petr Vorel
2019-03-10 17:48 ` 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=20190228220039.GC20335@dell5510 \
--to=pvorel@suse.cz \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=shuah@kernel.org \
--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).