From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lakshmi Ramasubramanian Date: Thu, 07 Nov 2019 00:21:43 +0000 Subject: Re: [PATCH v4 01/10] IMA: Defined an IMA hook to measure keys on key create or update Message-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="maccentraleurope" Content-Transfer-Encoding: base64 List-Id: References: <20191106190116.2578-1-nramas@linux.microsoft.com> <20191106190116.2578-2-nramas@linux.microsoft.com> <1573080189.5028.313.camel@linux.ibm.com> In-Reply-To: <1573080189.5028.313.camel@linux.ibm.com> To: Mimi Zohar , dhowells@redhat.com, matthewgarrett@google.com, sashal@kernel.org, jamorris@linux.microsoft.com, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, keyrings@vger.kernel.org, linux-kernel@vger.kernel.org Ck9uIDExLzYvMjAxOSAyOjQzIFBNLCBNaW1pIFpvaGFyIHdyb3RlOgoKPj4gK3ZvaWQgaW1hX3Bv c3Rfa2V5X2NyZWF0ZV9vcl91cGRhdGUoc3RydWN0IGtleSAqa2V5cmluZywgc3RydWN0IGtleSAq a2V5LAo+PiArCQkJCSAgIHVuc2lnbmVkIGxvbmcgZmxhZ3MsIGJvb2wgY3JlYXRlKQo+PiArewo+ PiArCWlmICgoa2V5cmluZyAhPSBOVUxMKSAmJiAoa2V5ICE9IE5VTEwpKQo+PiArCQlyZXR1cm47 Cj4gCj4gSSB3b3VsZCBtb3ZlIHRoZSBwYXRjaCB0aGF0IGRlZmluZXMgdGhlICJrZXlyaW5nPSIg cG9saWN5IG9wdGlvbiBwcmlvcgo+IHRvIHRoaXMgb25lLiDCoEluY2x1ZGUgdGhlIGNhbGwgdG8g cHJvY2Vzc19idWZmZXJfbWVhc3VyZW1lbnQoKSBpbiB0aGlzCj4gcGF0Y2guIMKgQSBzdWJzZXF1 ZW50IHBhdGNoIHdvdWxkIGFkZCBzdXBwb3J0IHRvIGRlZmVyIG1lYXN1cmluZyB0aGUKPiBrZXks IGJ5IGNhbGxpbmcgYSBmdW5jdGlvbiBuYW1lZCBzb21ldGhpbmcgbGlrZQo+IGltYV9xdWV1ZV9r ZXlfbWVhc3VyZW1lbnQoKS4KPiAKPiBNaW1pCgpBcyBJJ2Qgc3RhdGVkIGluIHRoZSBvdGhlciBy ZXNwb25zZSwgSSB3YW50ZWQgdG8gaXNvbGF0ZSBhbGwga2V5IHJlbGF0ZWQgCmNvZGUgaW4gYSBz ZXBhcmF0ZSBDIGZpbGUgYW5kIGJ1aWxkIGl0IGlmIGFuZCBvbmx5IGlmIGFsbCBDT05GSUcgCmRl cGVuZGVuY2llcyBhcmUgbWV0LgoKSSBjYW4gZG8gdGhlIGZvbGxvd2luZzoKCj0+IERlZmluZSB0 aGUgSU1BIGhvb2sgaW4gaW1hX2FzeW1tZXRyaWNfa2V5cy5jIGluc3RlYWQgb2YgaW1hX21haW4u YwoKPT4gSW4gaW5jbHVkZS9saW51eC9pbWEuaCBkZWNsYXJlIHRoZSBJTUEgaG9vayBpZiAKQ09O RklHX0lNQV9NRUFTVVJFX0FTWU1NRVRSSUNfS0VZUyBpcyBlbmFibGVkLgpFbHNlLCBOT1AgaXQu CgojaWZkZWYgQ09ORklHX0lNQV9NRUFTVVJFX0FTWU1NRVRSSUNfS0VZUwpleHRlcm4gdm9pZCBp bWFfcG9zdF9rZXlfY3JlYXRlX29yX3VwZGF0ZShzdHJ1Y3Qga2V5ICprZXlyaW5nLAoJCQkJCSAg c3RydWN0IGtleSAqa2V5LAoJCQkJCSAgdW5zaWduZWQgbG9uZyBmbGFncywKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgY3JlYXRlKTsKI2Vsc2UKc3RhdGlj IGlubGluZSB2b2lkIGltYV9wb3N0X2tleV9jcmVhdGVfb3JfdXBkYXRlKHN0cnVjdCBrZXkgKmtl eXJpbmcsCgkJCQkJCSBzdHJ1Y3Qga2V5ICprZXksCgkJCQkJCSB1bnNpZ25lZCBsb25nIGZsYWdz LAoJCQkJCQkgYm9vbCBjcmVhdGUpIHt9CiNlbmRpZgoKV291bGQgdGhhdCBiZSBhY2NlcHRhYmxl PwoKdGhhbmtzLAogIC1sYWtzaG1pCgo= 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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1,USER_IN_DEF_DKIM_WL autolearn=no 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 7041AFC6194 for ; Thu, 7 Nov 2019 00:21:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2B9B9217F5 for ; Thu, 7 Nov 2019 00:21:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="Ybz76JqW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728123AbfKGAVY (ORCPT ); Wed, 6 Nov 2019 19:21:24 -0500 Received: from linux.microsoft.com ([13.77.154.182]:35294 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727326AbfKGAVX (ORCPT ); Wed, 6 Nov 2019 19:21:23 -0500 Received: from [10.137.112.111] (unknown [131.107.147.111]) by linux.microsoft.com (Postfix) with ESMTPSA id C964720B7192; Wed, 6 Nov 2019 16:21:22 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com C964720B7192 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1573086082; bh=eEEXoIsgjYfls0Ada3aH4Nvwgp+zX0ZpkvcRvWey2wE=; h=Subject:To:References:From:Date:In-Reply-To:From; b=Ybz76JqWo8S/SHKczbTAnnAXEvfdR+hU62S0BJ/UxhSd5gDkGnszsim7VpPJcygU7 U8jVE5gwHgLRpjKITVm1b5P//2fZtD/6xm+wSHPTR4+CPJeG57p+hUnJ03jsiDDffc Wcd8Sc8rXFowL6qc3poi7EjfClSfg6d3kcmjgVjY= Subject: Re: [PATCH v4 01/10] IMA: Defined an IMA hook to measure keys on key create or update To: Mimi Zohar , dhowells@redhat.com, matthewgarrett@google.com, sashal@kernel.org, jamorris@linux.microsoft.com, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, keyrings@vger.kernel.org, linux-kernel@vger.kernel.org References: <20191106190116.2578-1-nramas@linux.microsoft.com> <20191106190116.2578-2-nramas@linux.microsoft.com> <1573080189.5028.313.camel@linux.ibm.com> From: Lakshmi Ramasubramanian Message-ID: Date: Wed, 6 Nov 2019 16:21:43 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.2.1 MIME-Version: 1.0 In-Reply-To: <1573080189.5028.313.camel@linux.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/6/2019 2:43 PM, Mimi Zohar wrote: >> +void ima_post_key_create_or_update(struct key *keyring, struct key *key, >> + unsigned long flags, bool create) >> +{ >> + if ((keyring != NULL) && (key != NULL)) >> + return; > > I would move the patch that defines the "keyring=" policy option prior > to this one.  Include the call to process_buffer_measurement() in this > patch.  A subsequent patch would add support to defer measuring the > key, by calling a function named something like > ima_queue_key_measurement(). > > Mimi As I'd stated in the other response, I wanted to isolate all key related code in a separate C file and build it if and only if all CONFIG dependencies are met. I can do the following: => Define the IMA hook in ima_asymmetric_keys.c instead of ima_main.c => In include/linux/ima.h declare the IMA hook if CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS is enabled. Else, NOP it. #ifdef CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS extern void ima_post_key_create_or_update(struct key *keyring, struct key *key, unsigned long flags, bool create); #else static inline void ima_post_key_create_or_update(struct key *keyring, struct key *key, unsigned long flags, bool create) {} #endif Would that be acceptable? thanks, -lakshmi