| Message ID | 20180419195503.7194-5-pvorel@suse.cz |
|---|---|
| State | Accepted |
| Delegated to: | Petr Vorel |
| Headers | show |
| Series | Rewrite tests into new API + fixes | expand |
diff --git a/testcases/kernel/security/integrity/ima/tests/ima_policy.sh b/testcases/kernel/security/integrity/ima/tests/ima_policy.sh index 35eb4055b..1c4a0b922 100755 --- a/testcases/kernel/security/integrity/ima/tests/ima_policy.sh +++ b/testcases/kernel/security/integrity/ima/tests/ima_policy.sh @@ -53,17 +53,9 @@ load_policy() exec 2>/dev/null 4>$IMA_POLICY [ $? -eq 0 ] || exit 1 - cat $1 | - while read line; do - if [ "${line#\#}" = "${line}" ]; then - echo "$line" >&4 2> /dev/null - if [ $? -ne 0 ]; then - exec 4>&- - return 1 - fi - fi - done + cat $1 >&4 2> /dev/null ret=$? + exec 4>&- [ $ret -eq 0 ] && \ tst_res TINFO "IMA policy updated, please reboot after testing to restore settings"
Originally writing the policy was done one rule at a time, but that's not required since kernel 2.6.35 (6ccd04563005 "ima: handle multiple rules per write") Signed-off-by: Petr Vorel <pvorel@suse.cz> Suggested-by: Mimi Zohar <zohar@linux.vnet.ibm.com> --- testcases/kernel/security/integrity/ima/tests/ima_policy.sh | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)