From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-29.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94DD7C433E0 for ; Tue, 23 Feb 2021 15:53:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 464C964E60 for ; Tue, 23 Feb 2021 15:53:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233236AbhBWPx1 (ORCPT ); Tue, 23 Feb 2021 10:53:27 -0500 Received: from linux.microsoft.com ([13.77.154.182]:41700 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233257AbhBWPxQ (ORCPT ); Tue, 23 Feb 2021 10:53:16 -0500 Received: from [192.168.0.104] (c-73-42-176-67.hsd1.wa.comcast.net [73.42.176.67]) by linux.microsoft.com (Postfix) with ESMTPSA id BFCCA20B6C40; Tue, 23 Feb 2021 07:52:34 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com BFCCA20B6C40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1614095554; bh=faEJBn8Q16fecxyvqfEcpWpy1hmaT12R7RUhZQ6+NgU=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=WwuOum/SmxNQ30yI+rMA90ZsQGSofXVNSj+WwXlXiw3z1qR3nRuYydlvlkrwGTepW /OwhECAglnrPuVnjXNFJ28AMiz/8DY/LB21cTKouKHmjLzTh/z4CDuceKu4TLMuLGi 73sNRzcmIHJDPyLbTy+2Kb//2jTMA+SADBzRghqk= Subject: Re: [PATCH] IMA: Check for ima-buf template is not required for keys tests To: Petr Vorel Cc: zohar@linux.ibm.com, tusharsu@linux.microsoft.com, ltp@lists.linux.it, linux-integrity@vger.kernel.org References: <20210222023421.12576-1-nramas@linux.microsoft.com> From: Lakshmi Ramasubramanian Message-ID: <2b7f2f88-7df8-bd31-59cb-fd74bfe555fd@linux.microsoft.com> Date: Tue, 23 Feb 2021 07:52:34 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org On 2/23/21 1:24 AM, Petr Vorel wrote: Hi Petr, > >> ima-buf is the default IMA template used for all buffer measurements. >> Therefore, IMA policy rule for measuring keys need not specify >> an IMA template. > Good catch. But was it alway? > IMHO ima-buf as default was added in dea87d0889dd ("ima: select ima-buf template for buffer measurement") in v5.11-rc1. For key measurements ima-buf template was required in the policy rule, but with the above commit (dea87d0889dd) it was changed to ima-buf. So we no longer need to specify the template in the policy. > But test1() tests 450d0fd51564 ("IMA: Call workqueue functions to measure queued keys") from v5.6-rc1. > Is it safe to ignore it? Even when the key is queued for measurement, ima-buf template will be used when the key is dequeued. Not sure if that answers your question. > BTW template=ima-buf requirement was added in commit b0418c93f ("IMA/ima_keys.sh: Require template=ima-buf, fix grep pattern") > > Also, shouldn't we check that there is none of the other templates (e.g. template=ima-ng, ...)? This is a good point - yes: we should check if no other template other than ima-buf is specified in the policy rule for measuring keys. > >> Update keys tests to not check for ima template in the policy rule. > >> Signed-off-by: Lakshmi Ramasubramanian >> --- >> This patch is based >> in https://github.com/pevik/ltp/commits/ima/selinux.v2.draft >> in branch ima/selinux.v2.draft. > >> testcases/kernel/security/integrity/ima/tests/ima_keys.sh | 5 ++--- >> 1 file changed, 2 insertions(+), 3 deletions(-) > >> diff --git a/testcases/kernel/security/integrity/ima/tests/ima_keys.sh b/testcases/kernel/security/integrity/ima/tests/ima_keys.sh >> index c9eef4b68..a3a7afbf7 100755 >> --- a/testcases/kernel/security/integrity/ima/tests/ima_keys.sh >> +++ b/testcases/kernel/security/integrity/ima/tests/ima_keys.sh >> @@ -15,8 +15,7 @@ TST_CLEANUP=cleanup >> . ima_setup.sh > >> FUNC_KEYCHECK='func=KEY_CHECK' >> -TEMPLATE_BUF='template=ima-buf' >> -REQUIRED_POLICY="^measure.*($FUNC_KEYCHECK.*$TEMPLATE_BUF|$TEMPLATE_BUF.*$FUNC_KEYCHECK)" >> +REQUIRED_POLICY="^measure.*($FUNC_KEYCHECK)" > nit: remove brackets: > REQUIRED_POLICY="^measure.*$FUNC_KEYCHECK" Sure - will remove that. > > There is > testcases/kernel/security/integrity/ima/datafiles/ima_keys/keycheck.policy file, > which should be a helper to load proper policy and needs to be updated as well: > -measure func=KEY_CHECK keyrings=.ima|.evm|.builtin_trusted_keys|.blacklist|key_import_test template=ima-buf > +measure func=KEY_CHECK keyrings=.ima|.evm|.builtin_trusted_keys|.blacklist|key_import_test > > I was also thinking to move keyrings to REQUIRED_POLICY, e.g.: > > KEYRINGS="keyrings=\.[a-z]+" > REQUIRED_POLICY="^measure.*($FUNC_KEYCHECK.*$KEYRINGS|$KEYRINGS.*$FUNC_KEYCHECK)" "keyrings=" is optional in the policy. If keyrings is specified it should be checked. thanks, -lakshmi > >> setup() >> { >> @@ -33,7 +32,7 @@ check_keys_policy() >> local pattern="$1" > >> if ! grep -E "$pattern" $TST_TMPDIR/policy.txt; then >> - tst_res TCONF "IMA policy must specify $pattern, $FUNC_KEYCHECK, $TEMPLATE_BUF" >> + tst_res TCONF "IMA policy must specify $pattern, $FUNC_KEYCHECK" >> return 1 >> fi >> return 0