Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp2225424ybh; Fri, 17 Jul 2020 12:19:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXNunHAF9XcS3x9tvN5Medeq8WuUL5/S2tGGcRkO7+eFtFU5gKAHjxsrv4vwFg7t88Ucve X-Received: by 2002:a17:906:fa92:: with SMTP id lt18mr9880136ejb.534.1595013579848; Fri, 17 Jul 2020 12:19:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595013579; cv=none; d=google.com; s=arc-20160816; b=bMllYEnBcQHAom65IUrl4lDwQ2by661ClASQ3zCK78FObC5VCiDKKKYqLQbVEV+AeF zLlPZi2UVyNIRmAVJLKXRs5LSGJrEzGKKCYCjKut7Gfb6M7K+eC6ZgvTHhLhW1HO9upW WaNm5j9ZxwFOnmDqOM94jFrNXWtntRjmQtxzQ0QDOejHd4rlnHXGsQf1+TW/wAIP4fwA mG1ui8himyLnTWQ2wgw/m4WxgkVSgrdgriL8VrAN0H0Tx1XG0gHNJ/C2/SjO3m07cArR tVrXs4IO9Qlot4+6g6FK6wRD7K2xYUCrt3t685JExZQp/EHPAyNxJHqY7RzNXD/7P6Dv 4BHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature:dkim-filter; bh=936Ej6PwFgQOfbt701DNQeezvUrKmHxPwTEHqq6hXKU=; b=WSjlU3VwMCYKxaDErWpIsVNUv9T+M7vi3dmbHXO8kEaiFaEtJ1NyMd8vgKT8mnPkuS GFIC4IQHf4c2XPwyqvusxrsdXUpwa+GIX5YTKfMwSOuNSGqeZDPnXlzcfbeYcC+Wh1B6 /OlVl6J7etoqOBJ+0CYvem2HRQrB+1/Luk79wC7KmVFjArGN3fWDSZF3bkERTubsrn86 A1643tjyN8egSZ4MIzPj3GQGHALi29EsVFv3FXuNU1XavlkMWhezCIT8rhc1isNPK2/7 kuyuR222iovVI6dE8k8j7DX77OXVTorQzTkwmOS8l7l6g97UnKj0sVOT/ZOCXunZ+ZxY RkGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=f3Zr5ZsI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q4si5641289eds.15.2020.07.17.12.19.16; Fri, 17 Jul 2020 12:19:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=f3Zr5ZsI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728418AbgGQTTF (ORCPT + 99 others); Fri, 17 Jul 2020 15:19:05 -0400 Received: from linux.microsoft.com ([13.77.154.182]:44786 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727999AbgGQTTD (ORCPT ); Fri, 17 Jul 2020 15:19:03 -0400 Received: from sequoia (162-237-133-238.lightspeed.rcsntx.sbcglobal.net [162.237.133.238]) by linux.microsoft.com (Postfix) with ESMTPSA id 23F0320B4909; Fri, 17 Jul 2020 12:19:02 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 23F0320B4909 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1595013543; bh=936Ej6PwFgQOfbt701DNQeezvUrKmHxPwTEHqq6hXKU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=f3Zr5ZsIOFvcx46qNgCltlwYHhR1HuHpLu7UBhvo7kY++ksbg3hh1nnnporsU+NLW 6ZaKBg0zGqm6Z6qYYUvNaKNFOKdve4DjJAdILc5lICYPNZ5BFLjafTv7O9Viqdfmyu fmjlG458XsKqhcWkEZXTvjA1TlIxzc4ebD8SroSg= Date: Fri, 17 Jul 2020 14:18:58 -0500 From: Tyler Hicks To: Nayna , Lakshmi Ramasubramanian Cc: Mimi Zohar , Dmitry Kasatkin , James Morris , "Serge E . Hallyn" , Prakhar Srivastava , linux-kernel@vger.kernel.org, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org Subject: Re: [PATCH v3 06/12] ima: Fail rule parsing when the KEY_CHECK hook is combined with an invalid cond Message-ID: <20200717191858.GN3673@sequoia> References: <20200709061911.954326-1-tyhicks@linux.microsoft.com> <20200709061911.954326-7-tyhicks@linux.microsoft.com> <336cc947-1f70-0286-6506-6df3d1d23a1d@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <336cc947-1f70-0286-6506-6df3d1d23a1d@linux.vnet.ibm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020-07-17 14:56:46, Nayna wrote: > > On 7/9/20 2:19 AM, Tyler Hicks wrote: > > The KEY_CHECK function only supports the uid, pcr, and keyrings > > conditionals. Make this clear at policy load so that IMA policy authors > > don't assume that other conditionals are supported. > > > > Fixes: 5808611cccb2 ("IMA: Add KEY_CHECK func to measure keys") > > Signed-off-by: Tyler Hicks > > Reviewed-by: Lakshmi Ramasubramanian > > --- > > > > * v3 > > - Added Lakshmi's Reviewed-by > > - Adjust for the indentation change introduced in patch #4 > > * v2 > > - No change > > > > security/integrity/ima/ima_policy.c | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > > diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c > > index 1c64bd6f1728..81da02071d41 100644 > > --- a/security/integrity/ima/ima_policy.c > > +++ b/security/integrity/ima/ima_policy.c > > @@ -1023,6 +1023,13 @@ static bool ima_validate_rule(struct ima_rule_entry *entry) > > if (entry->action & ~(MEASURE | DONT_MEASURE)) > > return false; > > > > + if (entry->flags & ~(IMA_FUNC | IMA_UID | IMA_PCR | > > + IMA_KEYRINGS)) > > + return false; > > + > > + if (ima_rule_contains_lsm_cond(entry)) > > + return false; > > + > > break; > > default: > > return false; > > Should there be a check for IMA_MEASURE_ASYMMETRIC_KEYS in Opt_keyrings in > ima_parse_rule() to return immediately if not enabled ? I didn't notice that "keyrings=" could be disabled at build time. I think you're right that something like what I have below would be a good idea. @Lakshmi, do you agree? diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 81da02071d41..bd687560f88e 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -1212,6 +1212,11 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) case Opt_keyrings: ima_log_string(ab, "keyrings", args[0].from); + if (!IS_ENABLED(CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS)) { + result = -EINVAL; + break; + } + keyrings_len = strlen(args[0].from) + 1; if ((entry->keyrings) || Tyler > > Thanks & Regards, > > ???? - Nayna >