From: Mimi Zohar <zohar@linux.ibm.com>
To: linux-kselftest@vger.kernel.org, Shuah Khan <shuah@kernel.org>
Cc: linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org,
Mimi Zohar <zohar@linux.ibm.com>
Subject: [PATCH v2 1/5] selftests/ima: cleanup the kexec selftest
Date: Tue, 26 Feb 2019 18:26:56 -0500 [thread overview]
Message-ID: <1551223620-11586-2-git-send-email-zohar@linux.ibm.com> (raw)
In-Reply-To: <1551223620-11586-1-git-send-email-zohar@linux.ibm.com>
Remove the few bashisms and use the complete option name for clarity.
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
---
tools/testing/selftests/ima/test_kexec_load.sh | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/ima/test_kexec_load.sh b/tools/testing/selftests/ima/test_kexec_load.sh
index 1c10093fb526..0345803e7bec 100755
--- a/tools/testing/selftests/ima/test_kexec_load.sh
+++ b/tools/testing/selftests/ima/test_kexec_load.sh
@@ -1,7 +1,7 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
# Loading a kernel image via the kexec_load syscall should fail
-# when the kerne is CONFIG_KEXEC_VERIFY_SIG enabled and the system
+# when the kernel is CONFIG_KEXEC_VERIFY_SIG enabled and the system
# is booted in secureboot mode.
TEST="$0"
@@ -12,8 +12,8 @@ rc=0
ksft_skip=4
# kexec requires root privileges
-if [ $UID != 0 ]; then
- echo "$TEST: must be run as root" >&2
+if [ $(id -ru) -ne 0 ]; then
+ echo "$TEST: requires root privileges" >&2
exit $ksft_skip
fi
@@ -33,17 +33,17 @@ secureboot=`hexdump $file | awk '{print substr($4,length($4),1)}'`
# kexec_load should fail in secure boot mode
KERNEL_IMAGE="/boot/vmlinuz-`uname -r`"
-kexec -l $KERNEL_IMAGE &>> /dev/null
-if [ $? == 0 ]; then
- kexec -u
- if [ "$secureboot" == "1" ]; then
+kexec --load $KERNEL_IMAGE 2>&1 > /dev/null
+if [ $? -eq 0 ]; then
+ kexec --unload
+ if [ $secureboot -eq 1 ]; then
echo "$TEST: kexec_load succeeded [FAIL]"
rc=1
else
echo "$TEST: kexec_load succeeded [PASS]"
fi
else
- if [ "$secureboot" == "1" ]; then
+ if [ $secureboot -eq 1 ]; then
echo "$TEST: kexec_load failed [PASS]"
else
echo "$TEST: kexec_load failed [FAIL]"
--
2.7.5
WARNING: multiple messages have this Message-ID (diff)
From: zohar at linux.ibm.com (Mimi Zohar)
Subject: [PATCH v2 1/5] selftests/ima: cleanup the kexec selftest
Date: Tue, 26 Feb 2019 18:26:56 -0500 [thread overview]
Message-ID: <1551223620-11586-2-git-send-email-zohar@linux.ibm.com> (raw)
In-Reply-To: <1551223620-11586-1-git-send-email-zohar@linux.ibm.com>
Remove the few bashisms and use the complete option name for clarity.
Signed-off-by: Mimi Zohar <zohar at linux.ibm.com>
Reviewed-by: Petr Vorel <pvorel at suse.cz>
---
tools/testing/selftests/ima/test_kexec_load.sh | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/ima/test_kexec_load.sh b/tools/testing/selftests/ima/test_kexec_load.sh
index 1c10093fb526..0345803e7bec 100755
--- a/tools/testing/selftests/ima/test_kexec_load.sh
+++ b/tools/testing/selftests/ima/test_kexec_load.sh
@@ -1,7 +1,7 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
# Loading a kernel image via the kexec_load syscall should fail
-# when the kerne is CONFIG_KEXEC_VERIFY_SIG enabled and the system
+# when the kernel is CONFIG_KEXEC_VERIFY_SIG enabled and the system
# is booted in secureboot mode.
TEST="$0"
@@ -12,8 +12,8 @@ rc=0
ksft_skip=4
# kexec requires root privileges
-if [ $UID != 0 ]; then
- echo "$TEST: must be run as root" >&2
+if [ $(id -ru) -ne 0 ]; then
+ echo "$TEST: requires root privileges" >&2
exit $ksft_skip
fi
@@ -33,17 +33,17 @@ secureboot=`hexdump $file | awk '{print substr($4,length($4),1)}'`
# kexec_load should fail in secure boot mode
KERNEL_IMAGE="/boot/vmlinuz-`uname -r`"
-kexec -l $KERNEL_IMAGE &>> /dev/null
-if [ $? == 0 ]; then
- kexec -u
- if [ "$secureboot" == "1" ]; then
+kexec --load $KERNEL_IMAGE 2>&1 > /dev/null
+if [ $? -eq 0 ]; then
+ kexec --unload
+ if [ $secureboot -eq 1 ]; then
echo "$TEST: kexec_load succeeded [FAIL]"
rc=1
else
echo "$TEST: kexec_load succeeded [PASS]"
fi
else
- if [ "$secureboot" == "1" ]; then
+ if [ $secureboot -eq 1 ]; then
echo "$TEST: kexec_load failed [PASS]"
else
echo "$TEST: kexec_load failed [FAIL]"
--
2.7.5
WARNING: multiple messages have this Message-ID (diff)
From: zohar@linux.ibm.com (Mimi Zohar)
Subject: [PATCH v2 1/5] selftests/ima: cleanup the kexec selftest
Date: Tue, 26 Feb 2019 18:26:56 -0500 [thread overview]
Message-ID: <1551223620-11586-2-git-send-email-zohar@linux.ibm.com> (raw)
Message-ID: <20190226232656.R5jldvLhRRtKmXP4Aiv0vaJftsOv1jsu8a4NJ0EZpn4@z> (raw)
In-Reply-To: <1551223620-11586-1-git-send-email-zohar@linux.ibm.com>
Remove the few bashisms and use the complete option name for clarity.
Signed-off-by: Mimi Zohar <zohar at linux.ibm.com>
Reviewed-by: Petr Vorel <pvorel at suse.cz>
---
tools/testing/selftests/ima/test_kexec_load.sh | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/ima/test_kexec_load.sh b/tools/testing/selftests/ima/test_kexec_load.sh
index 1c10093fb526..0345803e7bec 100755
--- a/tools/testing/selftests/ima/test_kexec_load.sh
+++ b/tools/testing/selftests/ima/test_kexec_load.sh
@@ -1,7 +1,7 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
# Loading a kernel image via the kexec_load syscall should fail
-# when the kerne is CONFIG_KEXEC_VERIFY_SIG enabled and the system
+# when the kernel is CONFIG_KEXEC_VERIFY_SIG enabled and the system
# is booted in secureboot mode.
TEST="$0"
@@ -12,8 +12,8 @@ rc=0
ksft_skip=4
# kexec requires root privileges
-if [ $UID != 0 ]; then
- echo "$TEST: must be run as root" >&2
+if [ $(id -ru) -ne 0 ]; then
+ echo "$TEST: requires root privileges" >&2
exit $ksft_skip
fi
@@ -33,17 +33,17 @@ secureboot=`hexdump $file | awk '{print substr($4,length($4),1)}'`
# kexec_load should fail in secure boot mode
KERNEL_IMAGE="/boot/vmlinuz-`uname -r`"
-kexec -l $KERNEL_IMAGE &>> /dev/null
-if [ $? == 0 ]; then
- kexec -u
- if [ "$secureboot" == "1" ]; then
+kexec --load $KERNEL_IMAGE 2>&1 > /dev/null
+if [ $? -eq 0 ]; then
+ kexec --unload
+ if [ $secureboot -eq 1 ]; then
echo "$TEST: kexec_load succeeded [FAIL]"
rc=1
else
echo "$TEST: kexec_load succeeded [PASS]"
fi
else
- if [ "$secureboot" == "1" ]; then
+ if [ $secureboot -eq 1 ]; then
echo "$TEST: kexec_load failed [PASS]"
else
echo "$TEST: kexec_load failed [FAIL]"
--
2.7.5
next prev parent reply other threads:[~2019-02-26 23:27 UTC|newest]
Thread overview: 75+ 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 ` Mimi Zohar
2019-02-26 23:26 ` zohar
2019-02-26 23:26 ` Mimi Zohar [this message]
2019-02-26 23:26 ` [PATCH v2 1/5] selftests/ima: cleanup the kexec selftest Mimi Zohar
2019-02-26 23:26 ` zohar
2019-02-27 0:57 ` shuah
2019-02-27 0:57 ` shuah
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-26 23:26 ` Mimi Zohar
2019-02-26 23:26 ` zohar
2019-02-27 1:01 ` shuah
2019-02-27 1:01 ` shuah
2019-02-27 1:01 ` shuah
2019-02-28 19:54 ` Petr Vorel
2019-02-28 19:54 ` Petr Vorel
2019-02-28 19:54 ` pvorel
2019-02-26 23:26 ` [PATCH v2 3/5] selftests/ima: define common logging functions Mimi Zohar
2019-02-26 23:26 ` Mimi Zohar
2019-02-26 23:26 ` zohar
2019-02-27 1:39 ` shuah
2019-02-27 1:39 ` shuah
2019-02-27 1:39 ` shuah
2019-02-28 20:18 ` Petr Vorel
2019-02-28 20:18 ` Petr Vorel
2019-02-28 20:18 ` pvorel
2019-02-28 21:01 ` Petr Vorel
2019-02-28 21:01 ` Petr Vorel
2019-02-28 21:01 ` pvorel
2019-02-26 23:26 ` [PATCH v2 4/5] selftests/ima: kexec_file_load syscall test Mimi Zohar
2019-02-26 23:26 ` Mimi Zohar
2019-02-26 23:26 ` zohar
2019-02-27 1:54 ` shuah
2019-02-27 1:54 ` shuah
2019-02-27 1:54 ` shuah
2019-02-28 22:00 ` Petr Vorel
2019-02-28 22:00 ` Petr Vorel
2019-02-28 22:00 ` pvorel
2019-03-10 17:48 ` Mimi Zohar
2019-03-10 17:48 ` Mimi Zohar
2019-03-10 17:48 ` zohar
2019-03-11 8:34 ` Petr Vorel
2019-03-11 8:34 ` Petr Vorel
2019-03-11 8:34 ` pvorel
2019-03-11 11:49 ` Mimi Zohar
2019-03-11 11:49 ` Mimi Zohar
2019-03-11 11:49 ` zohar
2019-02-28 22:20 ` Petr Vorel
2019-02-28 22:20 ` Petr Vorel
2019-02-28 22:20 ` pvorel
2019-02-26 23:27 ` [PATCH v2 5/5] selftests/ima: loading kernel modules Mimi Zohar
2019-02-26 23:27 ` Mimi Zohar
2019-02-26 23:27 ` zohar
2019-02-27 1:59 ` shuah
2019-02-27 1:59 ` shuah
2019-02-27 1:59 ` shuah
2019-02-27 14:14 ` Mimi Zohar
2019-02-27 14:14 ` Mimi Zohar
2019-02-27 14:14 ` zohar
2019-02-27 15:33 ` shuah
2019-02-27 15:33 ` shuah
2019-02-27 15:33 ` shuah
2019-02-27 18:37 ` Mimi Zohar
2019-02-27 18:37 ` Mimi Zohar
2019-02-27 18:37 ` zohar
2019-02-28 23:14 ` Petr Vorel
2019-02-28 23:14 ` Petr Vorel
2019-02-28 23:14 ` pvorel
2019-02-28 22:32 ` Petr Vorel
2019-02-28 22:32 ` Petr Vorel
2019-02-28 22:32 ` pvorel
2019-03-10 17:48 ` Mimi Zohar
2019-03-10 17:48 ` Mimi Zohar
2019-03-10 17:48 ` 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=1551223620-11586-2-git-send-email-zohar@linux.ibm.com \
--to=zohar@linux.ibm.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=shuah@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.