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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 362BFC433FE for ; Thu, 24 Feb 2022 18:46:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231537AbiBXSrI (ORCPT ); Thu, 24 Feb 2022 13:47:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229850AbiBXSrI (ORCPT ); Thu, 24 Feb 2022 13:47:08 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0714F4C7BC; Thu, 24 Feb 2022 10:46:38 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 986FD61330; Thu, 24 Feb 2022 18:46:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43D12C340E9; Thu, 24 Feb 2022 18:46:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645728397; bh=ZRIL25zhAUg48lH14eqqeW0pLyxILXBHMP0S8m9bCk8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=rJYqDXHH+3VfG6C0oUBM1moumLHVCfZOSUBStzhJSnkPn5razVF2pUe5QvFDOseLz qPSHCjf8sHNwNwnSU7BUTyHscBURnYuSWzC5BZHdorLbmSLcWmAIVX8yDC2FZ5JuMX wp5mFUZJ9AE3kSCbW9gcePCtAyMtC+OyARdeBQKRRhSc3fdVJEbv/cnPO9cu+gQaHB 4Tv9is8SNQy2h1lHZQMSkAbpwZxJTqZ46L+eMk/fBBlbxsyQSbSkt4t+apI8EtJ8q3 gvP4D5Ez446e8hNMu4Gfkh5bSk6fkNLkV32HxemvmMSjBq1IzCdzpNeUqk2TiMBnvL HH1i2uRobvvqw== Date: Thu, 24 Feb 2022 10:46:25 -0800 From: Eric Biggers To: Mimi Zohar Cc: linux-integrity@vger.kernel.org, Stefan Berger , linux-fscrypt@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v5 4/8] ima: define a new template field 'd-type' and a new template 'ima-ngv2' Message-ID: References: <20220211214310.119257-1-zohar@linux.ibm.com> <20220211214310.119257-5-zohar@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org On Thu, Feb 24, 2022 at 11:16:51AM -0500, Mimi Zohar wrote: > On Wed, 2022-02-23 at 16:32 -0800, Eric Biggers wrote: > > On Fri, Feb 11, 2022 at 04:43:06PM -0500, Mimi Zohar wrote: > > > In preparation to differentiate between regular IMA file hashes and > > > fs-verity's file digests, define a new template field named 'd-type'. > > > Define a new template named 'ima-ngv2', which includes the new 'd-type' > > > field. > > > > > > Signed-off-by: Mimi Zohar > > > --- > > > security/integrity/ima/ima_template.c | 3 +++ > > > security/integrity/ima/ima_template_lib.c | 13 +++++++++++++ > > > security/integrity/ima/ima_template_lib.h | 2 ++ > > > 3 files changed, 18 insertions(+) > > > > > > diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c > > > index db1ad6d7a57f..b321342e5bee 100644 > > > --- a/security/integrity/ima/ima_template.c > > > +++ b/security/integrity/ima/ima_template.c > > > @@ -19,6 +19,7 @@ enum header_fields { HDR_PCR, HDR_DIGEST, HDR_TEMPLATE_NAME, > > > static struct ima_template_desc builtin_templates[] = { > > > {.name = IMA_TEMPLATE_IMA_NAME, .fmt = IMA_TEMPLATE_IMA_FMT}, > > > {.name = "ima-ng", .fmt = "d-ng|n-ng"}, > > > + {.name = "ima-ngv2", .fmt = "d-ng|n-ng|d-type"}, > > > {.name = "ima-sig", .fmt = "d-ng|n-ng|sig"}, > > > {.name = "ima-buf", .fmt = "d-ng|n-ng|buf"}, > > > {.name = "ima-modsig", .fmt = "d-ng|n-ng|sig|d-modsig|modsig"}, > > > @@ -40,6 +41,8 @@ static const struct ima_template_field supported_fields[] = { > > > .field_show = ima_show_template_digest_ng}, > > > {.field_id = "n-ng", .field_init = ima_eventname_ng_init, > > > .field_show = ima_show_template_string}, > > > + {.field_id = "d-type", .field_init = ima_eventdigest_type_init, > > > + .field_show = ima_show_template_string}, > > > {.field_id = "sig", .field_init = ima_eventsig_init, > > > .field_show = ima_show_template_sig}, > > > {.field_id = "buf", .field_init = ima_eventbuf_init, > > > > I notice that the "d-ng" field already contains both the hash algorithm and the > > hash itself, in the form :. Wouldn't it make more sense to > > define a "d-ngv2" field that contains ::? After all, > > both the type and algorithm are required to interpret the hash. > > > > Or in other words, what about the hash type is different from the hash algorithm > > that would result in them needing different handling here? > > Thanks, Eric. I really like your suggestion. Currently, type is > defined as either "ima" or "verity". Are you ok with prefixing each > record with these strings? > As I mentioned before I think "full_hash" would be more descriptive than "ima". (All of this is part of IMA.) It's up to you though. - Eric