From patchwork Wed Oct 6 10:30:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 12539053 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17206C433EF for ; Wed, 6 Oct 2021 10:31:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E6A2A61181 for ; Wed, 6 Oct 2021 10:31:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229824AbhJFKdA (ORCPT ); Wed, 6 Oct 2021 06:33:00 -0400 Received: from smtp-out2.suse.de ([195.135.220.29]:38058 "EHLO smtp-out2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237846AbhJFKdA (ORCPT ); Wed, 6 Oct 2021 06:33:00 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 529742036A; Wed, 6 Oct 2021 10:31:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1633516267; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NNNgVBra1c7ohlixB9tbEM5GavTzgMz6c6gx/RmLODI=; b=DvLDA+O4Bp4wALexWn1GBuF7VTUWCBymLJN1IeqTJKFgKNZzN7dUB/kX7XqRORjHPe09rP sxXiLvl2Wx+qSzWwgDwc4EOMjd2Swe+otCbMlqX8hALnUyrZZI4HbnrifkQRPlnPefB7C9 kaWdnEtJKdvX5BOrYBAbDPVEk5cfNDo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1633516267; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NNNgVBra1c7ohlixB9tbEM5GavTzgMz6c6gx/RmLODI=; b=8qgfjLQ+beMqBkAk4boMX2M88oZ84gF3cze2865HsX+cotR0TIpRiY4NFte1Kj9Uqw4nac cBg49xHVyp6s3zDg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 1959013E19; Wed, 6 Oct 2021 10:31:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id cId8BOt6XWF/dAAAMHmgww (envelope-from ); Wed, 06 Oct 2021 10:31:07 +0000 From: Petr Vorel To: ltp@lists.linux.it Cc: Alex Henrie , alexhenrie24@gmail.com, linux-integrity@vger.kernel.org, Mimi Zohar , Petr Vorel Subject: [PATCH v8 1/3] IMA: Move check_policy_writable() to ima_setup.sh and rename it Date: Wed, 6 Oct 2021 12:30:57 +0200 Message-Id: <20211006103059.9617-2-pvorel@suse.cz> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211006103059.9617-1-pvorel@suse.cz> References: <20211006103059.9617-1-pvorel@suse.cz> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org From: Alex Henrie Suggested-by: Petr Vorel Reviewed-by: Petr Vorel Signed-off-by: Alex Henrie Signed-off-by: Petr Vorel --- .../security/integrity/ima/tests/ima_policy.sh | 16 +++------------- .../security/integrity/ima/tests/ima_setup.sh | 10 ++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/testcases/kernel/security/integrity/ima/tests/ima_policy.sh b/testcases/kernel/security/integrity/ima/tests/ima_policy.sh index 244cf081d..8924549df 100755 --- a/testcases/kernel/security/integrity/ima/tests/ima_policy.sh +++ b/testcases/kernel/security/integrity/ima/tests/ima_policy.sh @@ -11,19 +11,9 @@ TST_CNT=2 . ima_setup.sh -check_policy_writable() -{ - local err="IMA policy already loaded and kernel not configured to enable multiple writes to it (need CONFIG_IMA_WRITE_POLICY=y)" - - [ -f $IMA_POLICY ] || tst_brk TCONF "$err" - # CONFIG_IMA_READ_POLICY - echo "" 2> log > $IMA_POLICY - grep -q "Device or resource busy" log && tst_brk TCONF "$err" -} - setup() { - check_policy_writable + require_policy_writable VALID_POLICY="$TST_DATAROOT/measure.policy" [ -f $VALID_POLICY ] || tst_brk TCONF "missing $VALID_POLICY" @@ -55,7 +45,7 @@ test1() local p1 - check_policy_writable + require_policy_writable load_policy $INVALID_POLICY & p1=$! wait "$p1" if [ $? -ne 0 ]; then @@ -71,7 +61,7 @@ test2() local p1 p2 rc1 rc2 - check_policy_writable + require_policy_writable load_policy $VALID_POLICY & p1=$! load_policy $VALID_POLICY & p2=$! wait "$p1"; rc1=$? diff --git a/testcases/kernel/security/integrity/ima/tests/ima_setup.sh b/testcases/kernel/security/integrity/ima/tests/ima_setup.sh index 565f0bc3e..9c25d634d 100644 --- a/testcases/kernel/security/integrity/ima/tests/ima_setup.sh +++ b/testcases/kernel/security/integrity/ima/tests/ima_setup.sh @@ -73,6 +73,16 @@ require_policy_readable() fi } +require_policy_writable() +{ + local err="IMA policy already loaded and kernel not configured to enable multiple writes to it (need CONFIG_IMA_WRITE_POLICY=y)" + + [ -f $IMA_POLICY ] || tst_brk TCONF "$err" + # CONFIG_IMA_READ_POLICY + echo "" 2> log > $IMA_POLICY + grep -q "Device or resource busy" log && tst_brk TCONF "$err" +} + check_ima_policy_content() { local pattern="$1" From patchwork Wed Oct 6 10:30:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 12539055 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 663A0C433FE for ; Wed, 6 Oct 2021 10:31:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 44EBE61215 for ; Wed, 6 Oct 2021 10:31:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237846AbhJFKdC (ORCPT ); Wed, 6 Oct 2021 06:33:02 -0400 Received: from smtp-out2.suse.de ([195.135.220.29]:38076 "EHLO smtp-out2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237851AbhJFKdA (ORCPT ); Wed, 6 Oct 2021 06:33:00 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 942592036B; Wed, 6 Oct 2021 10:31:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1633516267; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mAyH2CJtRCU4xqE/aaGcE/R2zsO563hWfAIpryl4syc=; b=hrVAoC3lOIJq4E1CvdSkFPzfRX0Namn90jkVzugIqeiJNkt5yYVCzHj3RungHW1PWxa817 RXt3fJKxUI9ewXzf2uKvFEFP6L4JIh7fs9P/xOT/2gkl2VSfZ5EDhHEkMfos4CDnIL1mln Z/8STleHgC3fgZzGkvBGtd1dsSWCKV8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1633516267; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mAyH2CJtRCU4xqE/aaGcE/R2zsO563hWfAIpryl4syc=; b=qq+RELZbPbkyGAf160A8Gjgd3ORKNLnPovVv7wbnzfMOkFu/oPM4PMSnEJ4Mvgg12w3pHm TB3WDIH1aohFW9Cg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5BA8F13E19; Wed, 6 Oct 2021 10:31:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id cLu6FOt6XWF/dAAAMHmgww (envelope-from ); Wed, 06 Oct 2021 10:31:07 +0000 From: Petr Vorel To: ltp@lists.linux.it Cc: Alex Henrie , alexhenrie24@gmail.com, linux-integrity@vger.kernel.org, Mimi Zohar , Petr Vorel Subject: [PATCH v8 2/3] IMA: Move ima_check to ima_setup.sh Date: Wed, 6 Oct 2021 12:30:58 +0200 Message-Id: <20211006103059.9617-3-pvorel@suse.cz> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211006103059.9617-1-pvorel@suse.cz> References: <20211006103059.9617-1-pvorel@suse.cz> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org From: Alex Henrie Reviewed-by: Petr Vorel Signed-off-by: Alex Henrie [ pvorel: add test_file parameter to ima_check(), keep $TEST_FILE in ima_measurements.sh ] Signed-off-by: Petr Vorel --- .../integrity/ima/tests/ima_measurements.sh | 31 ++----------------- .../security/integrity/ima/tests/ima_setup.sh | 28 +++++++++++++++++ 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/testcases/kernel/security/integrity/ima/tests/ima_measurements.sh b/testcases/kernel/security/integrity/ima/tests/ima_measurements.sh index ef8577d30..a83c416de 100755 --- a/testcases/kernel/security/integrity/ima/tests/ima_measurements.sh +++ b/testcases/kernel/security/integrity/ima/tests/ima_measurements.sh @@ -21,33 +21,6 @@ setup() [ -f "$IMA_POLICY" ] || tst_res TINFO "not using default policy" } -ima_check() -{ - local algorithm digest expected_digest line tmp - - # need to read file to get updated $ASCII_MEASUREMENTS - cat $TEST_FILE > /dev/null - - line="$(grep $TEST_FILE $ASCII_MEASUREMENTS | tail -1)" - - if tmp=$(get_algorithm_digest "$line"); then - algorithm=$(echo "$tmp" | cut -d'|' -f1) - digest=$(echo "$tmp" | cut -d'|' -f2) - else - tst_res TBROK "failed to get algorithm/digest for '$TEST_FILE': $tmp" - fi - - tst_res TINFO "computing digest for $algorithm algorithm" - expected_digest="$(compute_digest $algorithm $TEST_FILE)" || \ - tst_brk TCONF "cannot compute digest for $algorithm algorithm" - - if [ "$digest" = "$expected_digest" ]; then - tst_res TPASS "correct digest found" - else - tst_res TFAIL "digest not found" - fi -} - check_iversion_support() { local device mount fs @@ -83,7 +56,7 @@ test1() { tst_res TINFO "verify adding record to the IMA measurement list" ROD echo "$(date) this is a test file" \> $TEST_FILE - ima_check + ima_check $TEST_FILE } test2() @@ -92,7 +65,7 @@ test2() tst_res TINFO "verify updating record in the IMA measurement list" check_iversion_support || return ROD echo "$(date) modified file" \> $TEST_FILE - ima_check + ima_check $TEST_FILE } test3() diff --git a/testcases/kernel/security/integrity/ima/tests/ima_setup.sh b/testcases/kernel/security/integrity/ima/tests/ima_setup.sh index 9c25d634d..af7f3a5f5 100644 --- a/testcases/kernel/security/integrity/ima/tests/ima_setup.sh +++ b/testcases/kernel/security/integrity/ima/tests/ima_setup.sh @@ -279,6 +279,34 @@ get_algorithm_digest() echo "$algorithm|$digest" } +ima_check() +{ + local test_file="$1" + local algorithm digest expected_digest line tmp + + # need to read file to get updated $ASCII_MEASUREMENTS + cat $test_file > /dev/null + + line="$(grep $test_file $ASCII_MEASUREMENTS | tail -1)" + + if tmp=$(get_algorithm_digest "$line"); then + algorithm=$(echo "$tmp" | cut -d'|' -f1) + digest=$(echo "$tmp" | cut -d'|' -f2) + else + tst_res TBROK "failed to get algorithm/digest for '$test_file': $tmp" + fi + + tst_res TINFO "computing digest for $algorithm algorithm" + expected_digest="$(compute_digest $algorithm $test_file)" || \ + tst_brk TCONF "cannot compute digest for $algorithm algorithm" + + if [ "$digest" = "$expected_digest" ]; then + tst_res TPASS "correct digest found" + else + tst_res TFAIL "digest not found" + fi +} + # check_evmctl REQUIRED_TPM_VERSION # return: 0: evmctl is new enough, 1: version older than required (or version < v0.9) check_evmctl() From patchwork Wed Oct 6 10:30:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 12539057 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A995CC4332F for ; Wed, 6 Oct 2021 10:31:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8D77960EE3 for ; Wed, 6 Oct 2021 10:31:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237851AbhJFKdC (ORCPT ); Wed, 6 Oct 2021 06:33:02 -0400 Received: from smtp-out1.suse.de ([195.135.220.28]:43932 "EHLO smtp-out1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237856AbhJFKdA (ORCPT ); Wed, 6 Oct 2021 06:33:00 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id D63DB224F4; Wed, 6 Oct 2021 10:31:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1633516267; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N+en3ZuUsBHZlVQNahZku78kNuNJSgkqqBay6AsX4tY=; b=0rXcyq3jSeT1ZCiQiP1Cmt2hlr+njphT9HOSMfy61EmvvvrgsnNe4za9c/sHE83Ay4bEhM iX1VGJoKx5WyX+jy+6n6joDNALO8FWEPXvPLPibJ9tDMICmr/jr8+SReBbyLjExGXBDu8h juH5EbEK9Dt/q5c4vAOoiFnyPFX3aC4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1633516267; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N+en3ZuUsBHZlVQNahZku78kNuNJSgkqqBay6AsX4tY=; b=wV+L1QTE88Dj1HJ2ILFck6GTg8SRO8r0u6/c3kAifjWoMiLK6BAS50c/j5r4EH6nHRpdyb VsTVfyC7MUj76cBg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 9EFEC13E19; Wed, 6 Oct 2021 10:31:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id sIZiJet6XWF/dAAAMHmgww (envelope-from ); Wed, 06 Oct 2021 10:31:07 +0000 From: Petr Vorel To: ltp@lists.linux.it Cc: Alex Henrie , alexhenrie24@gmail.com, linux-integrity@vger.kernel.org, Mimi Zohar , Petr Vorel Subject: [PATCH v8 3/3] IMA: Add tests for uid, gid, fowner, and fgroup options Date: Wed, 6 Oct 2021 12:30:59 +0200 Message-Id: <20211006103059.9617-4-pvorel@suse.cz> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211006103059.9617-1-pvorel@suse.cz> References: <20211006103059.9617-1-pvorel@suse.cz> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org From: Alex Henrie Requires "ima: add gid support". Reviewed-by: Petr Vorel Signed-off-by: Alex Henrie [ pvorel: add test_file parameter to ima_check(), add verify_measurement() (DRY) ] Signed-off-by: Petr Vorel --- runtest/ima | 1 + .../integrity/ima/tests/ima_conditionals.sh | 63 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100755 testcases/kernel/security/integrity/ima/tests/ima_conditionals.sh diff --git a/runtest/ima b/runtest/ima index 29caa034a..01942eefa 100644 --- a/runtest/ima +++ b/runtest/ima @@ -6,4 +6,5 @@ ima_violations ima_violations.sh ima_keys ima_keys.sh ima_kexec ima_kexec.sh ima_selinux ima_selinux.sh +ima_conditionals ima_conditionals.sh evm_overlay evm_overlay.sh diff --git a/testcases/kernel/security/integrity/ima/tests/ima_conditionals.sh b/testcases/kernel/security/integrity/ima/tests/ima_conditionals.sh new file mode 100755 index 000000000..c83006f6d --- /dev/null +++ b/testcases/kernel/security/integrity/ima/tests/ima_conditionals.sh @@ -0,0 +1,63 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2021 VPI Engineering +# Copyright (c) 2021 Petr Vorel +# Author: Alex Henrie +# +# Verify that conditional rules work. + +TST_NEEDS_CMDS="chgrp chown id sg sudo" +TST_CNT=1 +TST_NEEDS_DEVICE=1 + +. ima_setup.sh + +verify_measurement() +{ + local request="$1" + local user="nobody" + local test_file="$PWD/test.txt" + local cmd="cat $test_file > /dev/null" + + local value="$(id -u $user)" + [ "$request" = 'gid' -o "$request" = 'fgroup' ] && value="$(id -g $user)" + + require_policy_writable + + ROD rm -f $test_file + + tst_res TINFO "verify measuring user files when requested via $request" + ROD echo "measure $request=$value" \> $IMA_POLICY + ROD echo "$(date) $request test" \> $test_file + + case "$request" in + fgroup) + chgrp $user $test_file + $cmd + ;; + fowner) + chown $user $test_file + $cmd + ;; + gid) sudo sg $user "sh -c '$cmd'";; + uid) sudo -n -u $user sh -c "$cmd";; + *) tst_brk TBROK "Invalid res type '$1'";; + esac + + ima_check $test_file +} + +test1() +{ + verify_measurement uid + verify_measurement fowner + + if tst_kvcmp -lt 5.16; then + tst_brk TCONF "gid and fgroup options require kernel 5.16 or newer" + fi + + verify_measurement gid + verify_measurement fgroup +} + +tst_run