From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mimi Zohar Date: Wed, 27 Nov 2019 18:52:21 +0000 Subject: Re: [PATCH v9 5/6] IMA: Add support to limit measuring keys Message-Id: <1574880741.4793.292.camel@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="maccentraleurope" Content-Transfer-Encoding: base64 List-Id: References: <20191127015654.3744-1-nramas@linux.microsoft.com> <20191127015654.3744-6-nramas@linux.microsoft.com> In-Reply-To: <20191127015654.3744-6-nramas@linux.microsoft.com> To: Lakshmi Ramasubramanian , linux-integrity@vger.kernel.org Cc: eric.snowberg@oracle.com, dhowells@redhat.com, matthewgarrett@google.com, sashal@kernel.org, jamorris@linux.microsoft.com, linux-kernel@vger.kernel.org, keyrings@vger.kernel.org PiAtLS0gYS9zZWN1cml0eS9pbnRlZ3JpdHkvaW1hL2ltYV9wb2xpY3kuYwo+ICsrKyBiL3NlY3Vy aXR5L2ludGVncml0eS9pbWEvaW1hX3BvbGljeS5jCj4gQEAgLTc5LDYgKzc5LDcgQEAgc3RydWN0 IGltYV9ydWxlX2VudHJ5IHsKPiAgCQlpbnQgdHlwZTsJLyogYXVkaXQgdHlwZSAqLwo+ICAJfSBs c21bTUFYX0xTTV9SVUxFU107Cj4gIAljaGFyICpmc25hbWU7Cj4gKwljaGFyICprZXlyaW5nczsg LyogTWVhc3VyZSBrZXlzIGFkZGVkIHRvIHRoZXNlIGtleXJpbmdzICovCj4gIAlzdHJ1Y3QgaW1h X3RlbXBsYXRlX2Rlc2MgKnRlbXBsYXRlOwo+ICB9Owo+ICAKPiBAQCAtMzU2LDYgKzM1Nyw1NSBA QCBpbnQgaW1hX2xzbV9wb2xpY3lfY2hhbmdlKHN0cnVjdCBub3RpZmllcl9ibG9jayAqbmIsIHVu c2lnbmVkIGxvbmcgZXZlbnQsCj4gIAlyZXR1cm4gTk9USUZZX09LOwo+ICB9Cj4gIAo+ICsvKioK PiArICogaW1hX21hdGNoX2tleXJpbmcgLSBkZXRlcm1pbmUgd2hldGhlciB0aGUga2V5cmluZyBt YXRjaGVzIHRoZSBtZWFzdXJlIHJ1bGUKPiArICogQHJ1bGU6IGEgcG9pbnRlciB0byBhIHJ1bGUK PiArICogQGtleXJpbmc6IG5hbWUgb2YgdGhlIGtleXJpbmcgdG8gbWF0Y2ggYWdhaW5zdCB0aGUg bWVhc3VyZSBydWxlCj4gKyAqCj4gKyAqIElmIHRoZSBtZWFzdXJlIGFjdGlvbiBmb3IgS0VZX0NI RUNLIGRvZXMgbm90IHNwZWNpZnkga2V5cmluZ3M+ICsgKiBvcHRpb24gdGhlbiByZXR1cm4gdHJ1 ZSAoTWVhc3VyZSBhbGwga2V5cykuCj4gKyAqIEVsc2UsIHJldHVybiB0cnVlIGlmIHRoZSBnaXZl biBrZXlyaW5nIG5hbWUgaXMgcHJlc2VudCBpbgo+ICsgKiB0aGUga2V5cmluZ3M9IG9wdGlvbi4g RmFsc2UsIG90aGVyd2lzZS4KClRoaXMgaXMgc3VwcG9zZSB0byBiZSBhIGNvbW1lbnQsIG5vdCBj b2RlIG9yIHBzZXVkbyBjb2RlLiDCoFBsZWFzZQpyZWZlciB0byB0aGUgc2VjdGlvbiAiQ29tbWVu dHMiIGluIERvY3VtZW50YXRpb24vcHJvY2Vzcy9jb2RpbmctCnN0eWxlLnJzdC4KwqAKPiArICov Cj4gK3N0YXRpYyBib29sIGltYV9tYXRjaF9rZXlyaW5nKHN0cnVjdCBpbWFfcnVsZV9lbnRyeSAq cnVsZSwKPiArCQkJICAgICAgY29uc3QgY2hhciAqa2V5cmluZykKPiArewo+ICsJY29uc3QgY2hh ciAqcDsKPiArCj4gKwkvKiBJZiAia2V5cmluZ3M9IiBpcyBub3Qgc3BlY2lmaWVkIGFsbCBrZXlz IGFyZSBtZWFzdXJlZC4gKi8KPiArCWlmICghcnVsZS0+a2V5cmluZ3MpCj4gKwkJcmV0dXJuIHRy dWU7Cj4gKwo+ICsJaWYgKCFrZXlyaW5nKQo+ICsJCXJldHVybiBmYWxzZTsKPiArCj4gKwkvKgo+ ICsJICogImtleXJpbmdzPSIgaXMgc3BlY2lmaWVkIGluIHRoZSBwb2xpY3kgaW4gdGhlIGZvcm1h dCBiZWxvdzoKPiArCSAqICAga2V5cmluZ3M9LmJ1aWx0aW5fdHJ1c3RlZF9rZXlzfC5pbWF8LmV2 bQo+ICsJICoKPiArCSAqIEVhY2gga2V5cmluZyBuYW1lIGluIHRoZSBvcHRpb24gaXMgc2VwYXJh dGVkIGJ5IGEgJ3wnIGFuZAo+ICsJICogdGhlIGxhc3Qga2V5cmluZyBuYW1lIGlzIG51bGwgdGVy bWluYXRlZC4KPiArCSAqCj4gKwkgKiBUaGUgZ2l2ZW4ga2V5cmluZyBpcyBjb25zaWRlcmVkIG1h dGNoZWQgb25seSBpZgo+ICsJICogdGhlIHdob2xlIGtleXJpbmcgbmFtZSBtYXRjaGVkIGEga2V5 cmluZyBuYW1lIHNwZWNpZmllZAo+ICsJICogaW4gdGhlICJrZXlyaW5ncz0iIG9wdGlvbi4KPiAr CSAqLwo+ICsJcCA9IHN0cnN0cihydWxlLT5rZXlyaW5ncywga2V5cmluZyk7Cj4gKwlpZiAocCkg ewo+ICsJCS8qCj4gKwkJICogRm91bmQgYSBzdWJzdHJpbmcgbWF0Y2guIENoZWNrIGlmIHRoZSBj aGFyYWN0ZXIKPiArCQkgKiBhdCB0aGUgZW5kIG9mIHRoZSBrZXlyaW5nIG5hbWUgaXMgfCAoa2V5 cmluZyBuYW1lCj4gKwkJICogc2VwYXJhdG9yKSBvciBpcyB0aGUgdGVybWluYXRpbmcgbnVsbCBj aGFyYWN0ZXIuCj4gKwkJICogSWYgeWVzLCB3ZSBoYXZlIGEgd2hvbGUgc3RyaW5nIG1hdGNoLgo+ ICsJCSAqLwo+ICsJCXAgKz0gc3RybGVuKGtleXJpbmcpOwo+ICsJCWlmICgqcCA9ICd8JyB8fCAq cCA9ICdcMCcpCj4gKwkJCXJldHVybiB0cnVlOwo+ICsJfQo+ICsKClVzaW5nICJ3aGlsZSBzdHJz ZXAoKSIgd291bGQgc2ltcGxpZnkgdGhpcyBjb2RlLCByZW1vdmluZyB0aGUgbmVlZCBmb3IKc3Vj aCBhIGxvbmcgY29tbWVudC4KCk1pbWkKCj4gKwlyZXR1cm4gZmFsc2U7Cj4gK30KPiArCg== 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=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 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 3FE06C43215 for ; Wed, 27 Nov 2019 18:52:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 22F572070B for ; Wed, 27 Nov 2019 18:52:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727026AbfK0Swc (ORCPT ); Wed, 27 Nov 2019 13:52:32 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:27934 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727172AbfK0Swc (ORCPT ); Wed, 27 Nov 2019 13:52:32 -0500 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xARIoOEh039737 for ; Wed, 27 Nov 2019 13:52:29 -0500 Received: from e06smtp04.uk.ibm.com (e06smtp04.uk.ibm.com [195.75.94.100]) by mx0b-001b2d01.pphosted.com with ESMTP id 2whcy84deu-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 27 Nov 2019 13:52:29 -0500 Received: from localhost by e06smtp04.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 27 Nov 2019 18:52:27 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp04.uk.ibm.com (192.168.101.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 27 Nov 2019 18:52:23 -0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id xARIqNot58327128 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 27 Nov 2019 18:52:23 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0216042049; Wed, 27 Nov 2019 18:52:23 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EDA904203F; Wed, 27 Nov 2019 18:52:21 +0000 (GMT) Received: from dhcp-9-31-103-87.watson.ibm.com (unknown [9.31.103.87]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 27 Nov 2019 18:52:21 +0000 (GMT) Subject: Re: [PATCH v9 5/6] IMA: Add support to limit measuring keys From: Mimi Zohar To: Lakshmi Ramasubramanian , linux-integrity@vger.kernel.org Cc: eric.snowberg@oracle.com, dhowells@redhat.com, matthewgarrett@google.com, sashal@kernel.org, jamorris@linux.microsoft.com, linux-kernel@vger.kernel.org, keyrings@vger.kernel.org Date: Wed, 27 Nov 2019 13:52:21 -0500 In-Reply-To: <20191127015654.3744-6-nramas@linux.microsoft.com> References: <20191127015654.3744-1-nramas@linux.microsoft.com> <20191127015654.3744-6-nramas@linux.microsoft.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.20.5 (3.20.5-1.fc24) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 19112718-0016-0000-0000-000002CD15C5 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19112718-0017-0000-0000-0000332EF741 Message-Id: <1574880741.4793.292.camel@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 definitions=2019-11-27_04:2019-11-27,2019-11-27 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 bulkscore=0 spamscore=0 mlxlogscore=999 impostorscore=0 malwarescore=0 adultscore=0 priorityscore=1501 phishscore=0 suspectscore=3 lowpriorityscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1911270152 Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org > --- a/security/integrity/ima/ima_policy.c > +++ b/security/integrity/ima/ima_policy.c > @@ -79,6 +79,7 @@ struct ima_rule_entry { > int type; /* audit type */ > } lsm[MAX_LSM_RULES]; > char *fsname; > + char *keyrings; /* Measure keys added to these keyrings */ > struct ima_template_desc *template; > }; > > @@ -356,6 +357,55 @@ int ima_lsm_policy_change(struct notifier_block *nb, unsigned long event, > return NOTIFY_OK; > } > > +/** > + * ima_match_keyring - determine whether the keyring matches the measure rule > + * @rule: a pointer to a rule > + * @keyring: name of the keyring to match against the measure rule > + * > + * If the measure action for KEY_CHECK does not specify keyrings= > + * option then return true (Measure all keys). > + * Else, return true if the given keyring name is present in > + * the keyrings= option. False, otherwise. This is suppose to be a comment, not code or pseudo code.  Please refer to the section "Comments" in Documentation/process/coding- style.rst.   > + */ > +static bool ima_match_keyring(struct ima_rule_entry *rule, > + const char *keyring) > +{ > + const char *p; > + > + /* If "keyrings=" is not specified all keys are measured. */ > + if (!rule->keyrings) > + return true; > + > + if (!keyring) > + return false; > + > + /* > + * "keyrings=" is specified in the policy in the format below: > + * keyrings=.builtin_trusted_keys|.ima|.evm > + * > + * Each keyring name in the option is separated by a '|' and > + * the last keyring name is null terminated. > + * > + * The given keyring is considered matched only if > + * the whole keyring name matched a keyring name specified > + * in the "keyrings=" option. > + */ > + p = strstr(rule->keyrings, keyring); > + if (p) { > + /* > + * Found a substring match. Check if the character > + * at the end of the keyring name is | (keyring name > + * separator) or is the terminating null character. > + * If yes, we have a whole string match. > + */ > + p += strlen(keyring); > + if (*p == '|' || *p == '\0') > + return true; > + } > + Using "while strsep()" would simplify this code, removing the need for such a long comment. Mimi > + return false; > +} > +