From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mimi Zohar Date: Wed, 13 Nov 2019 20:09:24 +0000 Subject: Re: [PATCH v6 3/3] KEYS: Call the IMA hook to measure keys Message-Id: <1573675764.4843.14.camel@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="ibm852" Content-Transfer-Encoding: base64 List-Id: References: <20191113184658.2862-1-nramas@linux.microsoft.com> <20191113184658.2862-4-nramas@linux.microsoft.com> In-Reply-To: <20191113184658.2862-4-nramas@linux.microsoft.com> To: Lakshmi Ramasubramanian , 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 T24gV2VkLCAyMDE5LTExLTEzIGF0IDEwOjQ2IC0wODAwLCBMYWtzaG1pIFJhbWFzdWJyYW1hbmlh biB3cm90ZToKPiBDYWxsIHRoZSBJTUEgaG9vayBmcm9tIGtleV9jcmVhdGVfb3JfdXBkYXRlIGZ1 bmN0aW9uIHRvIG1lYXN1cmUKPiB0aGUga2V5IHdoZW4gYSBuZXcga2V5IGlzIGNyZWF0ZWQgb3Ig YW4gZXhpc3Rpbmcga2V5IGlzIHVwZGF0ZWQuCj4gCj4gVGhpcyBwYXRjaCBhZGRzIHRoZSBjYWxs IHRvIHRoZSBJTUEgaG9vayBmcm9tIGtleV9jcmVhdGVfb3JfdXBkYXRlCj4gZnVuY3Rpb24gdG8g bWVhc3VyZSB0aGUga2V5IG9uIGtleSBjcmVhdGUgb3IgdXBkYXRlLgo+IAo+IFNpZ25lZC1vZmYt Ynk6IExha3NobWkgUmFtYXN1YnJhbWFuaWFuIDxucmFtYXNAbGludXgubWljcm9zb2Z0LmNvbT4K PiAtLS0KPiAgaW5jbHVkZS9saW51eC9pbWEuaCB8IDEzICsrKysrKysrKysrKysKPiAgc2VjdXJp dHkva2V5cy9rZXkuYyB8ICA5ICsrKysrKysrKwo+ICAyIGZpbGVzIGNoYW5nZWQsIDIyIGluc2Vy dGlvbnMoKykKPiAKPiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9pbWEuaCBiL2luY2x1ZGUv bGludXgvaW1hLmgKPiBpbmRleCA2ZDkwNDc1NGQ4NTguLmVjNWFmZTMxOWFiNyAxMDA2NDQKPiAt LS0gYS9pbmNsdWRlL2xpbnV4L2ltYS5oCj4gKysrIGIvaW5jbHVkZS9saW51eC9pbWEuaAo+IEBA IC0yNSw2ICsyNSwxMiBAQCBleHRlcm4gaW50IGltYV9wb3N0X3JlYWRfZmlsZShzdHJ1Y3QgZmls ZSAqZmlsZSwgdm9pZCAqYnVmLCBsb2ZmX3Qgc2l6ZSwKPiAgZXh0ZXJuIHZvaWQgaW1hX3Bvc3Rf cGF0aF9ta25vZChzdHJ1Y3QgZGVudHJ5ICpkZW50cnkpOwo+ICBleHRlcm4gdm9pZCBpbWFfa2V4 ZWNfY21kbGluZShjb25zdCB2b2lkICpidWYsIGludCBzaXplKTsKPiAgCj4gKyNpZmRlZiBDT05G SUdfSU1BX01FQVNVUkVfQVNZTU1FVFJJQ19LRVlTCj4gK2V4dGVybiB2b2lkIGltYV9wb3N0X2tl eV9jcmVhdGVfb3JfdXBkYXRlKHN0cnVjdCBrZXkgKmtleXJpbmcsCj4gKwkJCQkJICBzdHJ1Y3Qg a2V5ICprZXksCj4gKwkJCQkJICB1bnNpZ25lZCBsb25nIGZsYWdzLCBib29sIGNyZWF0ZSk7Cj4g KyNlbmRpZgo+ICsKPiAgI2lmZGVmIENPTkZJR19JTUFfS0VYRUMKPiAgZXh0ZXJuIHZvaWQgaW1h X2FkZF9rZXhlY19idWZmZXIoc3RydWN0IGtpbWFnZSAqaW1hZ2UpOwo+ICAjZW5kaWYKPiBAQCAt MTAxLDYgKzEwNywxMyBAQCBzdGF0aWMgaW5saW5lIHZvaWQgaW1hX2FkZF9rZXhlY19idWZmZXIo c3RydWN0IGtpbWFnZSAqaW1hZ2UpCj4gIHt9Cj4gICNlbmRpZgo+ICAKPiArI2lmbmRlZiBDT05G SUdfSU1BX01FQVNVUkVfQVNZTU1FVFJJQ19LRVlTCj4gK3N0YXRpYyBpbmxpbmUgdm9pZCBpbWFf cG9zdF9rZXlfY3JlYXRlX29yX3VwZGF0ZShzdHJ1Y3Qga2V5ICprZXlyaW5nLAo+ICsJCQkJCQkg c3RydWN0IGtleSAqa2V5LAo+ICsJCQkJCQkgdW5zaWduZWQgbG9uZyBmbGFncywKPiArCQkJCQkJ IGJvb2wgY3JlYXRlKSB7fQo+ICsjZW5kaWYKPiArCj4gICNpZmRlZiBDT05GSUdfSU1BX0FQUFJB SVNFCj4gIGV4dGVybiBib29sIGlzX2ltYV9hcHByYWlzZV9lbmFibGVkKHZvaWQpOwo+ICBleHRl cm4gdm9pZCBpbWFfaW5vZGVfcG9zdF9zZXRhdHRyKHN0cnVjdCBkZW50cnkgKmRlbnRyeSk7Cj4g ZGlmZiAtLWdpdCBhL3NlY3VyaXR5L2tleXMva2V5LmMgYi9zZWN1cml0eS9rZXlzL2tleS5jCj4g aW5kZXggNzY0ZjRjNTc5MTNlLi45NzgyZDRkMDQ2ZmQgMTAwNjQ0Cj4gLS0tIGEvc2VjdXJpdHkv a2V5cy9rZXkuYwo+ICsrKyBiL3NlY3VyaXR5L2tleXMva2V5LmMKPiBAQCAtMTMsNiArMTMsNyBA QAo+ICAjaW5jbHVkZSA8bGludXgvc2VjdXJpdHkuaD4KPiAgI2luY2x1ZGUgPGxpbnV4L3dvcmtx dWV1ZS5oPgo+ICAjaW5jbHVkZSA8bGludXgvcmFuZG9tLmg+Cj4gKyNpbmNsdWRlIDxsaW51eC9p bWEuaD4KPiAgI2luY2x1ZGUgPGxpbnV4L2Vyci5oPgo+ICAjaW5jbHVkZSAiaW50ZXJuYWwuaCIK PiAgCj4gQEAgLTkzNiw2ICs5MzcsOSBAQCBrZXlfcmVmX3Qga2V5X2NyZWF0ZV9vcl91cGRhdGUo a2V5X3JlZl90IGtleXJpbmdfcmVmLAo+ICAJCWdvdG8gZXJyb3JfbGlua19lbmQ7Cj4gIAl9Cj4g IAo+ICsJLyogbGV0IHRoZSBpbWEgbW9kdWxlIGtub3cgYWJvdXQgdGhlIGNyZWF0ZWQga2V5LiAq LwoKVGhpcyBjb21tZW50IGFuZCB0aGUgb25lIGJlbG93IGRvZXNuJ3QgcHJvdmlkZSBhbnkgYWRk aXRpb25hbAppbmZvcm1hdGlvbi4gwqBQbGVhc2UgcmVtb3ZlIHRoZW0uCgo+ICsJaW1hX3Bvc3Rf a2V5X2NyZWF0ZV9vcl91cGRhdGUoa2V5cmluZywga2V5LCBmbGFncywgdHJ1ZSk7Cj4gKwo+ICAJ a2V5X3JlZiA9IG1ha2Vfa2V5X3JlZihrZXksIGlzX2tleV9wb3NzZXNzZWQoa2V5cmluZ19yZWYp KTsKPiAgCj4gIGVycm9yX2xpbmtfZW5kOgo+IEBAIC05NjUsNiArOTY5LDExIEBAIGtleV9yZWZf dCBrZXlfY3JlYXRlX29yX3VwZGF0ZShrZXlfcmVmX3Qga2V5cmluZ19yZWYsCj4gIAl9Cj4gIAo+ ICAJa2V5X3JlZiA9IF9fa2V5X3VwZGF0ZShrZXlfcmVmLCAmcHJlcCk7Cj4gKwo+ICsJLyogbGV0 IHRoZSBpbWEgbW9kdWxlIGtub3cgYWJvdXQgdGhlIHVwZGF0ZWQga2V5LiAqLwo+ICsJaWYgKCFJ U19FUlIoa2V5X3JlZikpCj4gKwkJaW1hX3Bvc3Rfa2V5X2NyZWF0ZV9vcl91cGRhdGUoa2V5cmlu Zywga2V5LCBmbGFncywgZmFsc2UpOwo+ICsKPiAgCWdvdG8gZXJyb3JfZnJlZV9wcmVwOwo+ICB9 Cj4gIEVYUE9SVF9TWU1CT0woa2V5X2NyZWF0ZV9vcl91cGRhdGUpOwo= 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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 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 2E944C43141 for ; Wed, 13 Nov 2019 20:09:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C333B20679 for ; Wed, 13 Nov 2019 20:09:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726991AbfKMUJf (ORCPT ); Wed, 13 Nov 2019 15:09:35 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:32648 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726983AbfKMUJf (ORCPT ); Wed, 13 Nov 2019 15:09:35 -0500 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id xADK7gfC097553 for ; Wed, 13 Nov 2019 15:09:34 -0500 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0a-001b2d01.pphosted.com with ESMTP id 2w8nb1gacv-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 13 Nov 2019 15:09:33 -0500 Received: from localhost by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 13 Nov 2019 20:09:31 -0000 Received: from b06avi18626390.portsmouth.uk.ibm.com (9.149.26.192) by e06smtp01.uk.ibm.com (192.168.101.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 13 Nov 2019 20:09:27 -0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06avi18626390.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id xADK8oos19399068 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Nov 2019 20:08:50 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 843A842042; Wed, 13 Nov 2019 20:09:26 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7E9B042041; Wed, 13 Nov 2019 20:09:25 +0000 (GMT) Received: from dhcp-9-31-103-201.watson.ibm.com (unknown [9.31.103.201]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 13 Nov 2019 20:09:25 +0000 (GMT) Subject: Re: [PATCH v6 3/3] KEYS: Call the IMA hook to measure keys From: Mimi Zohar To: Lakshmi Ramasubramanian , 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 Date: Wed, 13 Nov 2019 15:09:24 -0500 In-Reply-To: <20191113184658.2862-4-nramas@linux.microsoft.com> References: <20191113184658.2862-1-nramas@linux.microsoft.com> <20191113184658.2862-4-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: 19111320-4275-0000-0000-0000037D7AD7 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19111320-4276-0000-0000-00003890DDFC Message-Id: <1573675764.4843.14.camel@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-11-13_04:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=11 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1910280000 definitions=main-1911130164 Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org On Wed, 2019-11-13 at 10:46 -0800, Lakshmi Ramasubramanian wrote: > Call the IMA hook from key_create_or_update function to measure > the key when a new key is created or an existing key is updated. > > This patch adds the call to the IMA hook from key_create_or_update > function to measure the key on key create or update. > > Signed-off-by: Lakshmi Ramasubramanian > --- > include/linux/ima.h | 13 +++++++++++++ > security/keys/key.c | 9 +++++++++ > 2 files changed, 22 insertions(+) > > diff --git a/include/linux/ima.h b/include/linux/ima.h > index 6d904754d858..ec5afe319ab7 100644 > --- a/include/linux/ima.h > +++ b/include/linux/ima.h > @@ -25,6 +25,12 @@ extern int ima_post_read_file(struct file *file, void *buf, loff_t size, > extern void ima_post_path_mknod(struct dentry *dentry); > extern void ima_kexec_cmdline(const void *buf, int size); > > +#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); > +#endif > + > #ifdef CONFIG_IMA_KEXEC > extern void ima_add_kexec_buffer(struct kimage *image); > #endif > @@ -101,6 +107,13 @@ static inline void ima_add_kexec_buffer(struct kimage *image) > {} > #endif > > +#ifndef CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS > +static inline void ima_post_key_create_or_update(struct key *keyring, > + struct key *key, > + unsigned long flags, > + bool create) {} > +#endif > + > #ifdef CONFIG_IMA_APPRAISE > extern bool is_ima_appraise_enabled(void); > extern void ima_inode_post_setattr(struct dentry *dentry); > diff --git a/security/keys/key.c b/security/keys/key.c > index 764f4c57913e..9782d4d046fd 100644 > --- a/security/keys/key.c > +++ b/security/keys/key.c > @@ -13,6 +13,7 @@ > #include > #include > #include > +#include > #include > #include "internal.h" > > @@ -936,6 +937,9 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref, > goto error_link_end; > } > > + /* let the ima module know about the created key. */ This comment and the one below doesn't provide any additional information.  Please remove them. > + ima_post_key_create_or_update(keyring, key, flags, true); > + > key_ref = make_key_ref(key, is_key_possessed(keyring_ref)); > > error_link_end: > @@ -965,6 +969,11 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref, > } > > key_ref = __key_update(key_ref, &prep); > + > + /* let the ima module know about the updated key. */ > + if (!IS_ERR(key_ref)) > + ima_post_key_create_or_update(keyring, key, flags, false); > + > goto error_free_prep; > } > EXPORT_SYMBOL(key_create_or_update);