From: Stefan Berger <stefanb@linux.ibm.com>
To: Mimi Zohar <zohar@linux.ibm.com>, linux-integrity@vger.kernel.org
Cc: roberto.sassu@huaweicloud.com
Subject: Re: [ima-evm-utils PATCH 04/14] tests: Address issues raised by shellcheck SC2320
Date: Tue, 21 Nov 2023 18:20:26 -0500 [thread overview]
Message-ID: <3aab1167-80bb-4ed9-b200-fbb87586b0a0@linux.ibm.com> (raw)
In-Reply-To: <3083025b210cd5c44e9fa0df578c0b210a690f0c.camel@linux.ibm.com>
On 11/21/23 18:03, Mimi Zohar wrote:
> Hi Stefan,
>
> On Fri, 2023-11-10 at 15:21 -0500, Stefan Berger wrote:
>> Address issues raised by shellcheck SC2320:
>> "This $? refers to echo/printf, not a previous command.
>> Assign to variable to avoid it being overwritten."
>>
>> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
>> ---
>> tests/Makefile.am | 2 +-
>> tests/mmap_check.test | 8 +++-----
>> tests/portable_signatures.test | 9 +++------
>> 3 files changed, 7 insertions(+), 12 deletions(-)
>>
>> diff --git a/tests/Makefile.am b/tests/Makefile.am
>> index bcc1ee4..babfa7a 100644
>> --- a/tests/Makefile.am
>> +++ b/tests/Makefile.am
>> @@ -26,7 +26,7 @@ clean-local:
>> distclean: distclean-keys
>>
>> shellcheck:
>> - shellcheck -i SC2086,SC2181,SC2046 \
>> + shellcheck -i SC2086,SC2181,SC2046,SC2320 \
>> functions.sh gen-keys.sh install-fsverity.sh \
>> install-mount-idmapped.sh install-openssl3.sh \
>> install-swtpm.sh install-tss.sh softhsm_setup \
>> diff --git a/tests/mmap_check.test b/tests/mmap_check.test
>> index 2dd3433..3d2e1b1 100755
>> --- a/tests/mmap_check.test
>> +++ b/tests/mmap_check.test
>> @@ -97,11 +97,9 @@ check_load_ima_rule() {
>>
>> new_policy=$(mktemp -p "$g_mountpoint")
>> echo "$1" > "$new_policy"
>> - echo "$new_policy" > /sys/kernel/security/ima/policy
>> - result=$?
>> - rm -f "$new_policy"
>> -
>> - if [ "$result" -ne 0 ]; then
>> + if echo "$new_policy" > /sys/kernel/security/ima/policy; then
>> + rm -f "$new_policy"
>> + else
>> echo "${RED}Failed to set IMA policy${NORM}"
>> return "$HARDFAIL"
>> fi
>
> This isn't equiavlent. $new_policy was previously always removed.
Uuuh, thanks. Fixed.
>
>> diff --git a/tests/portable_signatures.test b/tests/portable_signatures.test
>> index 9f3339b..5251211 100755
>> --- a/tests/portable_signatures.test
>> +++ b/tests/portable_signatures.test
>> @@ -80,7 +80,6 @@ METADATA_CHANGE_FOWNER_2=3002
>>
>> check_load_ima_rule() {
>> local rule_loaded
>> - local result
>> local new_policy
>>
>> rule_loaded=$(grep "$1" /sys/kernel/security/ima/policy)
>> @@ -88,11 +87,9 @@ check_load_ima_rule() {
>> new_policy=$(mktemp -p "$g_mountpoint")
>> echo "$1" > "$new_policy"
>> evmctl sign -o -a sha256 --imasig --key "$key_path" "$new_policy" &> /dev/null
>> - echo "$new_policy" > /sys/kernel/security/ima/policy
>> - result=$?
>> - rm -f "$new_policy"
>> -
>> - if [ "$result" -ne 0 ]; then
>> + if echo "$new_policy" > /sys/kernel/security/ima/policy; then
>> + rm -f "$new_policy"
>> + else
>> echo "${RED}Failed to set IMA policy${NORM}"
>> return "$FAIL"
>> fi
>
> Same here.
>
next prev parent reply other threads:[~2023-11-21 23:20 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-10 20:21 [ima-evm-utils PATCH 00/14] Enable shellcheck and fix some issue Stefan Berger
2023-11-10 20:21 ` [ima-evm-utils PATCH 01/14] tests: Address issues raised by shellcheck SC2086 & enable shellcheck Stefan Berger
2023-11-10 20:21 ` [ima-evm-utils PATCH 02/14] tests: Address issues raised by shellcheck SC2181 Stefan Berger
2023-11-10 20:21 ` [ima-evm-utils PATCH 03/14] tests: Address issues raised by shellcheck SC2046 Stefan Berger
2023-11-10 20:21 ` [ima-evm-utils PATCH 04/14] tests: Address issues raised by shellcheck SC2320 Stefan Berger
2023-11-21 23:03 ` Mimi Zohar
2023-11-21 23:20 ` Stefan Berger [this message]
2023-11-10 20:21 ` [ima-evm-utils PATCH 05/14] tests: Address issues raised by shellcheck SC2317 Stefan Berger
2023-11-10 20:21 ` [ima-evm-utils PATCH 06/14] tests: Address issues raised by shellcheck SC2034 Stefan Berger
2023-11-10 20:21 ` [ima-evm-utils PATCH 07/14] tests: Address issues raised by shellcheck SC2164 Stefan Berger
2023-11-10 20:21 ` [ima-evm-utils PATCH 08/14] tests: Address issues raised by shellcheck SC2166 Stefan Berger
2023-11-10 20:21 ` [ima-evm-utils PATCH 09/14] tests: Address issues raised by shellcheck SC2294 Stefan Berger
2023-11-10 20:21 ` [ima-evm-utils PATCH 10/14] tests: Address issues raised by shellcheck SC2206 Stefan Berger
2023-11-10 20:21 ` [ima-evm-utils PATCH 11/14] tests: Address issues raised by shellcheck SC2196 Stefan Berger
2023-11-10 20:21 ` [ima-evm-utils PATCH 12/14] tests: Address issues raised by shellcheck SC2043 Stefan Berger
2023-11-10 20:21 ` [ima-evm-utils PATCH 13/14] tests: Address issues raised by shellcheck SC2295 Stefan Berger
2023-11-10 20:21 ` [ima-evm-utils PATCH 14/14] tests: Address issues raised by shellcheck SC2003 Stefan Berger
2023-11-13 10:35 ` Roberto Sassu
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=3aab1167-80bb-4ed9-b200-fbb87586b0a0@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=linux-integrity@vger.kernel.org \
--cc=roberto.sassu@huaweicloud.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 read-only IMAP folder(s) and NNTP newsgroup(s).