From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 39D2921962301 for ; Tue, 19 Mar 2019 17:06:58 -0700 (PDT) Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x2JNxNhF071605 for ; Tue, 19 Mar 2019 20:06:57 -0400 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0a-001b2d01.pphosted.com with ESMTP id 2rb8qqmaee-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 19 Mar 2019 20:06:56 -0400 Received: from localhost by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 20 Mar 2019 00:06:49 -0000 Subject: Re: [PATCH 2/6] security/keys/encrypted: Clean up request_trusted_key() From: Mimi Zohar Date: Tue, 19 Mar 2019 20:06:38 -0400 In-Reply-To: <155297558570.2276575.11731393787282486177.stgit@dwillia2-desk3.amr.corp.intel.com> References: <155297557534.2276575.16264199708584900090.stgit@dwillia2-desk3.amr.corp.intel.com> <155297558570.2276575.11731393787282486177.stgit@dwillia2-desk3.amr.corp.intel.com> Mime-Version: 1.0 Message-Id: <1553040398.4899.149.camel@linux.ibm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" To: Dan Williams , keyrings@vger.kernel.org Cc: David Howells , James Bottomley , linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org List-ID: T24gTW9uLCAyMDE5LTAzLTE4IGF0IDIzOjA2IC0wNzAwLCBEYW4gV2lsbGlhbXMgd3JvdGU6Cgo8 IHNuaXAgPgoKPiArLyoKPiArICogcmVxdWVzdF90cnVzdGVkX2tleSAtIHJlcXVlc3QgdGhlIHRy dXN0ZWQga2V5Cj4gKyAqCj4gKyAqIFRydXN0ZWQga2V5cyBhcmUgc2VhbGVkIHRvIFBDUnMgYW5k IG90aGVyIG1ldGFkYXRhLiBBbHRob3VnaCB1c2Vyc3BhY2UKPiArICogbWFuYWdlcyBib3RoIHRy dXN0ZWQvZW5jcnlwdGVkIGtleS10eXBlcywgbGlrZSB0aGUgZW5jcnlwdGVkIGtleSB0eXBlCj4g KyAqIGRhdGEsIHRydXN0ZWQga2V5IHR5cGUgZGF0YSBpcyBub3QgdmlzaWJsZSBkZWNyeXB0ZWQg ZnJvbSB1c2Vyc3BhY2UuCj4gKyAqLwo+ICtzdGF0aWMgc3RydWN0IGtleSAqcmVxdWVzdF90cnVz dGVkX2tleShjb25zdCBjaGFyICp0cnVzdGVkX2Rlc2MsCj4gKwkJCQljb25zdCB1OCAqKm1hc3Rl cl9rZXksIHNpemVfdCAqbWFzdGVyX2tleWxlbikKPiArewo+ICsJc3RydWN0IHRydXN0ZWRfa2V5 X3BheWxvYWQgKnRwYXlsb2FkOwo+ICsJc3RydWN0IGtleV90eXBlICp0eXBlOwo+ICsJc3RydWN0 IGtleSAqdGtleTsKPiArCj4gKwl0eXBlID0ga2V5X3R5cGVfbG9va3VwKCJ0cnVzdGVkIik7CgpU aGUgYXNzb2NpYXRlZCBrZXlfdHlwZV9wdXQoKSB3aWxsIG5lZWQgdG8gYmUgY2FsbGVkLgoKPiAr CWlmIChJU19FUlIodHlwZSkpIHsKPiArCQl0a2V5ID0gKHN0cnVjdCBrZXkgKil0eXBlOwo+ICsJ CWdvdG8gZXJyb3I7Cj4gKwl9Cj4gKwl0a2V5ID0gcmVxdWVzdF9rZXkodHlwZSwgdHJ1c3RlZF9k ZXNjLCBOVUxMKTsKPiArCWlmIChJU19FUlIodGtleSkpCj4gKwkJZ290byBlcnJvcjsKPiArCj4g Kwlkb3duX3JlYWQoJnRrZXktPnNlbSk7Cj4gKwl0cGF5bG9hZCA9IHRrZXktPnBheWxvYWQuZGF0 YVswXTsKPiArCSptYXN0ZXJfa2V5ID0gdHBheWxvYWQtPmtleTsKPiArCSptYXN0ZXJfa2V5bGVu ID0gdHBheWxvYWQtPmtleV9sZW47Cj4gK2Vycm9yOgo+ICsJcmV0dXJuIHRrZXk7Cj4gK30KPiAr CgoKCj4gZGlmZiAtLWdpdCBhL3NlY3VyaXR5L2tleXMva2V5LmMgYi9zZWN1cml0eS9rZXlzL2tl eS5jCj4gaW5kZXggNjk2ZjFjMDkyYzUwLi45MDQ1YjYyYWZiMDQgMTAwNjQ0Cj4gLS0tIGEvc2Vj dXJpdHkva2V5cy9rZXkuYwo+ICsrKyBiL3NlY3VyaXR5L2tleXMva2V5LmMKPiBAQCAtNzA2LDYg KzcwNiw3IEBAIHN0cnVjdCBrZXlfdHlwZSAqa2V5X3R5cGVfbG9va3VwKGNvbnN0IGNoYXIgKnR5 cGUpCj4gIGZvdW5kX2tlcm5lbF90eXBlOgo+ICAJcmV0dXJuIGt0eXBlOwo+ICB9Cj4gK0VYUE9S VF9TWU1CT0xfR1BMKGtleV90eXBlX2xvb2t1cCk7CgpPbmx5IHRoZSBrZXJuZWwgaXMgY2FsbGlu ZyBrZXlfdHlwZV9sb29rdXAoKS4gwqBXaHkgZG9lcwprZXlfdHlwZV9sb29rdXAoKSBuZWVkIHRv IGJlIGV4cG9ydGVkPwoKTWltaQoKPiAgCj4gIHZvaWQga2V5X3NldF90aW1lb3V0KHN0cnVjdCBr ZXkgKmtleSwgdW5zaWduZWQgdGltZW91dCkKPiAgewo+IAoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KTGludXgtbnZkaW1tIG1haWxpbmcgbGlzdApMaW51 eC1udmRpbW1AbGlzdHMuMDEub3JnCmh0dHBzOi8vbGlzdHMuMDEub3JnL21haWxtYW4vbGlzdGlu Zm8vbGludXgtbnZkaW1tCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mimi Zohar Date: Wed, 20 Mar 2019 00:06:38 +0000 Subject: Re: [PATCH 2/6] security/keys/encrypted: Clean up request_trusted_key() Message-Id: <1553040398.4899.149.camel@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="maccentraleurope" Content-Transfer-Encoding: base64 List-Id: References: <155297557534.2276575.16264199708584900090.stgit@dwillia2-desk3.amr.corp.intel.com> <155297558570.2276575.11731393787282486177.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <155297558570.2276575.11731393787282486177.stgit@dwillia2-desk3.amr.corp.intel.com> To: Dan Williams , keyrings@vger.kernel.org Cc: David Howells , James Bottomley , linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org T24gTW9uLCAyMDE5LTAzLTE4IGF0IDIzOjA2IC0wNzAwLCBEYW4gV2lsbGlhbXMgd3JvdGU6Cgo8 IHNuaXAgPgoKPiArLyoKPiArICogcmVxdWVzdF90cnVzdGVkX2tleSAtIHJlcXVlc3QgdGhlIHRy dXN0ZWQga2V5Cj4gKyAqCj4gKyAqIFRydXN0ZWQga2V5cyBhcmUgc2VhbGVkIHRvIFBDUnMgYW5k IG90aGVyIG1ldGFkYXRhLiBBbHRob3VnaCB1c2Vyc3BhY2UKPiArICogbWFuYWdlcyBib3RoIHRy dXN0ZWQvZW5jcnlwdGVkIGtleS10eXBlcywgbGlrZSB0aGUgZW5jcnlwdGVkIGtleSB0eXBlCj4g KyAqIGRhdGEsIHRydXN0ZWQga2V5IHR5cGUgZGF0YSBpcyBub3QgdmlzaWJsZSBkZWNyeXB0ZWQg ZnJvbSB1c2Vyc3BhY2UuCj4gKyAqLwo+ICtzdGF0aWMgc3RydWN0IGtleSAqcmVxdWVzdF90cnVz dGVkX2tleShjb25zdCBjaGFyICp0cnVzdGVkX2Rlc2MsCj4gKwkJCQljb25zdCB1OCAqKm1hc3Rl cl9rZXksIHNpemVfdCAqbWFzdGVyX2tleWxlbikKPiArewo+ICsJc3RydWN0IHRydXN0ZWRfa2V5 X3BheWxvYWQgKnRwYXlsb2FkOwo+ICsJc3RydWN0IGtleV90eXBlICp0eXBlOwo+ICsJc3RydWN0 IGtleSAqdGtleTsKPiArCj4gKwl0eXBlID0ga2V5X3R5cGVfbG9va3VwKCJ0cnVzdGVkIik7CgpU aGUgYXNzb2NpYXRlZCBrZXlfdHlwZV9wdXQoKSB3aWxsIG5lZWQgdG8gYmUgY2FsbGVkLgoKPiAr CWlmIChJU19FUlIodHlwZSkpIHsKPiArCQl0a2V5ID0gKHN0cnVjdCBrZXkgKil0eXBlOwo+ICsJ CWdvdG8gZXJyb3I7Cj4gKwl9Cj4gKwl0a2V5ID0gcmVxdWVzdF9rZXkodHlwZSwgdHJ1c3RlZF9k ZXNjLCBOVUxMKTsKPiArCWlmIChJU19FUlIodGtleSkpCj4gKwkJZ290byBlcnJvcjsKPiArCj4g Kwlkb3duX3JlYWQoJnRrZXktPnNlbSk7Cj4gKwl0cGF5bG9hZCA9IHRrZXktPnBheWxvYWQuZGF0 YVswXTsKPiArCSptYXN0ZXJfa2V5ID0gdHBheWxvYWQtPmtleTsKPiArCSptYXN0ZXJfa2V5bGVu ID0gdHBheWxvYWQtPmtleV9sZW47Cj4gK2Vycm9yOgo+ICsJcmV0dXJuIHRrZXk7Cj4gK30KPiAr CgoKCj4gZGlmZiAtLWdpdCBhL3NlY3VyaXR5L2tleXMva2V5LmMgYi9zZWN1cml0eS9rZXlzL2tl eS5jCj4gaW5kZXggNjk2ZjFjMDkyYzUwLi45MDQ1YjYyYWZiMDQgMTAwNjQ0Cj4gLS0tIGEvc2Vj dXJpdHkva2V5cy9rZXkuYwo+ICsrKyBiL3NlY3VyaXR5L2tleXMva2V5LmMKPiBAQCAtNzA2LDYg KzcwNiw3IEBAIHN0cnVjdCBrZXlfdHlwZSAqa2V5X3R5cGVfbG9va3VwKGNvbnN0IGNoYXIgKnR5 cGUpCj4gIGZvdW5kX2tlcm5lbF90eXBlOgo+ICAJcmV0dXJuIGt0eXBlOwo+ICB9Cj4gK0VYUE9S VF9TWU1CT0xfR1BMKGtleV90eXBlX2xvb2t1cCk7CgpPbmx5IHRoZSBrZXJuZWwgaXMgY2FsbGlu ZyBrZXlfdHlwZV9sb29rdXAoKS4gwqBXaHkgZG9lcwprZXlfdHlwZV9sb29rdXAoKSBuZWVkIHRv IGJlIGV4cG9ydGVkPwoKTWltaQoKPiAgCj4gIHZvaWQga2V5X3NldF90aW1lb3V0KHN0cnVjdCBr ZXkgKmtleSwgdW5zaWduZWQgdGltZW91dCkKPiAgewo+IAo= 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=-4.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS 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 00DC7C43381 for ; Wed, 20 Mar 2019 00:06:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A6F5E217F4 for ; Wed, 20 Mar 2019 00:06:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727257AbfCTAG6 (ORCPT ); Tue, 19 Mar 2019 20:06:58 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:33752 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726908AbfCTAG5 (ORCPT ); Tue, 19 Mar 2019 20:06:57 -0400 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x2JNxYUt058347 for ; Tue, 19 Mar 2019 20:06:56 -0400 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0b-001b2d01.pphosted.com with ESMTP id 2rb85262v3-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 19 Mar 2019 20:06:56 -0400 Received: from localhost by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 20 Mar 2019 00:06:49 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) 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, 20 Mar 2019 00:06:46 -0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x2K06oBs45547588 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 20 Mar 2019 00:06:50 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7EFD552051; Wed, 20 Mar 2019 00:06:50 +0000 (GMT) Received: from localhost.localdomain (unknown [9.80.93.235]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 97C455204E; Wed, 20 Mar 2019 00:06:49 +0000 (GMT) Subject: Re: [PATCH 2/6] security/keys/encrypted: Clean up request_trusted_key() From: Mimi Zohar To: Dan Williams , keyrings@vger.kernel.org Cc: James Bottomley , David Howells , vishal.l.verma@intel.com, linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org Date: Tue, 19 Mar 2019 20:06:38 -0400 In-Reply-To: <155297558570.2276575.11731393787282486177.stgit@dwillia2-desk3.amr.corp.intel.com> References: <155297557534.2276575.16264199708584900090.stgit@dwillia2-desk3.amr.corp.intel.com> <155297558570.2276575.11731393787282486177.stgit@dwillia2-desk3.amr.corp.intel.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: 19032000-4275-0000-0000-0000031D04A1 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19032000-4276-0000-0000-0000382B8694 Message-Id: <1553040398.4899.149.camel@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-03-19_13:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 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-1810050000 definitions=main-1903190165 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2019-03-18 at 23:06 -0700, Dan Williams wrote: < snip > > +/* > + * request_trusted_key - request the trusted key > + * > + * Trusted keys are sealed to PCRs and other metadata. Although userspace > + * manages both trusted/encrypted key-types, like the encrypted key type > + * data, trusted key type data is not visible decrypted from userspace. > + */ > +static struct key *request_trusted_key(const char *trusted_desc, > + const u8 **master_key, size_t *master_keylen) > +{ > + struct trusted_key_payload *tpayload; > + struct key_type *type; > + struct key *tkey; > + > + type = key_type_lookup("trusted"); The associated key_type_put() will need to be called. > + if (IS_ERR(type)) { > + tkey = (struct key *)type; > + goto error; > + } > + tkey = request_key(type, trusted_desc, NULL); > + if (IS_ERR(tkey)) > + goto error; > + > + down_read(&tkey->sem); > + tpayload = tkey->payload.data[0]; > + *master_key = tpayload->key; > + *master_keylen = tpayload->key_len; > +error: > + return tkey; > +} > + > diff --git a/security/keys/key.c b/security/keys/key.c > index 696f1c092c50..9045b62afb04 100644 > --- a/security/keys/key.c > +++ b/security/keys/key.c > @@ -706,6 +706,7 @@ struct key_type *key_type_lookup(const char *type) > found_kernel_type: > return ktype; > } > +EXPORT_SYMBOL_GPL(key_type_lookup); Only the kernel is calling key_type_lookup().  Why does key_type_lookup() need to be exported? Mimi > > void key_set_timeout(struct key *key, unsigned timeout) > { >