Received-SPF: pass (google.com: domain of linux-crypto+bounces-4294-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Bharat Bhushan <bbhushan2@marvell.com>
To: Jarkko Sakkinen <jarkko@kernel.org>,
        Herbert Xu
	<herbert@gondor.apana.org.au>
CC: "linux-integrity@vger.kernel.org" <linux-integrity@vger.kernel.org>,
        "keyrings@vger.kernel.org" <keyrings@vger.kernel.org>,
        "Andreas.Fuchs@infineon.com" <Andreas.Fuchs@infineon.com>,
        James Prestwood
	<prestwoj@gmail.com>,
        David Woodhouse <dwmw2@infradead.org>,
        Eric Biggers
	<ebiggers@kernel.org>,
        James Bottomley
	<James.Bottomley@hansenpartnership.com>,
        "David S. Miller"
	<davem@davemloft.net>,
        "open list:CRYPTO API" <linux-crypto@vger.kernel.org>,
        open list <linux-kernel@vger.kernel.org>,
        Peter Huewe <peterhuewe@gmx.de>, Jason Gunthorpe <jgg@ziepe.ca>,
        James Bottomley
	<James.Bottomley@HansenPartnership.com>,
        Mimi Zohar <zohar@linux.ibm.com>, David Howells <dhowells@redhat.com>,
        Paul Moore <paul@paul-moore.com>, James
 Morris <jmorris@namei.org>,
        "Serge E. Hallyn" <serge@hallyn.com>,
        "open
 list:SECURITY SUBSYSTEM" <linux-security-module@vger.kernel.org>
Subject: RE: [EXTERNAL] [PATCH v2 5/6] tpm: tpm2_key: Extend parser to
 TPM_LoadableKey
Thread-Topic: [EXTERNAL] [PATCH v2 5/6] tpm: tpm2_key: Extend parser to
 TPM_LoadableKey
Thread-Index: AQHaqy2KsbjFo2j7N0iqMaIZLK/VLLGhLihA
Date: Tue, 21 May 2024 05:47:40 +0000
Message-ID: 
 <SN7PR18MB53140F4341BC441C1C11586EE3EA2@SN7PR18MB5314.namprd18.prod.outlook.com>
References: <20240521031645.17008-1-jarkko@kernel.org>
 <20240521031645.17008-6-jarkko@kernel.org>
In-Reply-To: <20240521031645.17008-6-jarkko@kernel.org>
Accept-Language: en-IN, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: 
 =?us-ascii?Q?5NfTAvn3SMk/biQQN8aSKNLaq268oKzbmpD1vYSFC1IZIm11Ael/NCBQs7wD?=
 =?us-ascii?Q?AHbSoSGLSLAc8iE2DUC2wfQUS34ve/LR9WHk2CqfjQKJlkjvT3zUcPGCVFPu?=
 =?us-ascii?Q?vCc3511aTgpregLQr4JZ7Bv2Ukl8nabAQHxk2dGYy+rFUQ7F7qL2ES+KJbfT?=
 =?us-ascii?Q?LhVIKtisuSMsMLCrMTXlCrGB7kK7V8fF+deCgfal+ADQxnVGzLLOodx26wYz?=
 =?us-ascii?Q?SFtJa0EHC01+i3iSSP8VFZc1sLtZ5uYe+dLrZZ2+5MWqqhI3b7RvutUq45mX?=
 =?us-ascii?Q?P6/08g7Q55v11sMYVISpCwG3RQPeQrOFWHgWDoqaL6DADhNpw6ZG76Ya8MBz?=
 =?us-ascii?Q?pwElYqs+pg4Y+GEsTUvPNOisahhmDQLSABUjocDrzqLzI5uXJ6/FJdpkUeaf?=
 =?us-ascii?Q?Woxg90wW9UF50x19l6JAZF9v5qFWsA3EnfYboUbjV+AcjC3PBWTii4wvLrEi?=
 =?us-ascii?Q?e8pp1SYzoVacKyS8/mKRVgseUeH0xzxYt72mPM9K/w+I53qroDUOz6g1d/Br?=
 =?us-ascii?Q?NHCM1OzkK9z7LNpY+73JVRhPRmFQdseGCX3erX/3wwFJSrPhLnfyYlOZ7iRZ?=
 =?us-ascii?Q?HukOVTlez8ETeofhmAOdhqw1JbKCz/u5Dp0Ql+SPeNFdP8UIillGlW5OCgjL?=
 =?us-ascii?Q?4jI+3m5xbq1KLWyUWwApkPcnMIHeczQYZGkZVRZZ3fEoylODdBsDdQUik1Oo?=
 =?us-ascii?Q?yh+SNjL0/qlP4dmGC3C9qr9W2Gg78gR3ckUbW/4+BiK0eaoHQq6g5FQjPkcQ?=
 =?us-ascii?Q?HIgHJO7gz7ki7obK8TtNWILkrvUtOdb8jcacP1OLaat3KoEPFFXMWvNIUjPz?=
 =?us-ascii?Q?hj7xlr13BI7kGijMRPy4BJJYZnPG3zjlkI+QmBaTx0j+m/oz53dlHXks7+dX?=
 =?us-ascii?Q?uI7yHwI/44uhuNJyyjYDUna33VlfP4A41DlJEdzTbiqElaX5K6Z2W2t37Pj6?=
 =?us-ascii?Q?kMYpM0Oh174LRmM5DLWE68k8q3x4qNMdKBnc5mM9cyKnm8RIeGDvD37C+8Sq?=
 =?us-ascii?Q?WpdnrbaDFxIObn7YN0x3hweArJXTdd5BfaGqjUmS5gqiB5+kVCW7UKkIyGn2?=
 =?us-ascii?Q?+/0p4JnTumNi/Z3g+kj1E1Topd7GRXOh8TwIPadXgAimUfRA9D1NyLd9cTpl?=
 =?us-ascii?Q?1Tj945jGvmlDZ0D8khGBuyKjbFegXxUVw1NcIchEa/P6FWj/1/8X3614W/Bs?=
 =?us-ascii?Q?0FIT3H4zQAAxFMwNCd2sQAR7zgMQBYgdYoOKx/EOFI/QSW7darj7RGoU8ojV?=
 =?us-ascii?Q?M2/xq2TtNpXTAiF21OBCum6eSfpdJat5vtbXzNUUyt/T1srtq9Zy5PPkB/W4?=
 =?us-ascii?Q?Dc6X6AhZKadJXlx7V4MmOzwpk0mHo6NwSFlS6jiom7YNFg+4+cLCdRPh2nn4?=
 =?us-ascii?Q?wZhmz/e2RZCeH50LKN5I4o3d8kYjCf9Q59znay7nttEVrnPfMGRqKduJzGNm?=
 =?us-ascii?Q?eY2YpWk7dcm1wR3hUDh86vv0EZrkbdzy9kv/t4+oIOx7X7WeJUUm+qtuExRH?=
 =?us-ascii?Q?w5gWC5NiMHD0KhRInipVYCVrZhVreQC9v8dp+ETu2P3tdim7QFK4T9/MpTXS?=
 =?us-ascii?Q?4vBXT0GSUT3KNFUgzyO6i91HXCP4vZeW3OLdW4gv?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-crypto@vger.kernel.org
List-Id: <linux-crypto.vger.kernel.org>
List-Subscribe: <mailto:linux-crypto+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-crypto+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-OriginatorOrg: marvell.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SN7PR18MB5314.namprd18.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9943a8eb-4f85-44ad-d5b3-08dc7959875f
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 May 2024 05:47:40.9695
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: i34LAu8SdB8vgO/7dMM7Tu2g7W9jfhWNrcSWHKijTBj5QInWsAFUDX2PyaWRGUSHQ2UhmSUs4Ml9/IXavnEznw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR18MB4210
X-Proofpoint-GUID: EU0n9cutVw3xFiXIhFYdHy3rMyC_gusD
X-Proofpoint-ORIG-GUID: EU0n9cutVw3xFiXIhFYdHy3rMyC_gusD
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16
 definitions=2024-05-21_03,2024-05-21_01,2024-05-17_01


> -----Original Message-----
> From: Jarkko Sakkinen <jarkko@kernel.org>
> Sent: Tuesday, May 21, 2024 8:47 AM
> To: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: linux-integrity@vger.kernel.org; keyrings@vger.kernel.org;
> Andreas.Fuchs@infineon.com; James Prestwood <prestwoj@gmail.com>;
> David Woodhouse <dwmw2@infradead.org>; Eric Biggers
> <ebiggers@kernel.org>; James Bottomley
> <James.Bottomley@hansenpartnership.com>; Jarkko Sakkinen
> <jarkko@kernel.org>; David S. Miller <davem@davemloft.net>; open
> list:CRYPTO API <linux-crypto@vger.kernel.org>; open list <linux-
> kernel@vger.kernel.org>; Peter Huewe <peterhuewe@gmx.de>; Jason
> Gunthorpe <jgg@ziepe.ca>; James Bottomley
> <James.Bottomley@HansenPartnership.com>; Mimi Zohar
> <zohar@linux.ibm.com>; David Howells <dhowells@redhat.com>; Paul Moore
> <paul@paul-moore.com>; James Morris <jmorris@namei.org>; Serge E. Hallyn
> <serge@hallyn.com>; open list:SECURITY SUBSYSTEM <linux-security-
> module@vger.kernel.org>
> Subject: [EXTERNAL] [PATCH v2 5/6] tpm: tpm2_key: Extend parser to
> TPM_LoadableKey
>=20
> ----------------------------------------------------------------------
> Extend parser to TPM_LoadableKey. Add field for oid to struct tpm2_key
> so that callers can differentiate different key types.
>=20
> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
> ---
>  drivers/char/tpm/tpm2_key.c               | 14 +++++++++++---
>  include/crypto/tpm2_key.h                 |  2 ++
>  security/keys/trusted-keys/trusted_tpm2.c |  4 ++++
>  3 files changed, 17 insertions(+), 3 deletions(-)
>=20
> diff --git a/drivers/char/tpm/tpm2_key.c b/drivers/char/tpm/tpm2_key.c
> index 0112362e432e..59797dc232f1 100644
> --- a/drivers/char/tpm/tpm2_key.c
> +++ b/drivers/char/tpm/tpm2_key.c
> @@ -32,16 +32,24 @@ int tpm2_key_type(void *context, size_t hdrlen,
>  		  const void *value, size_t vlen)
>  {
>  	enum OID oid =3D look_up_OID(value, vlen);
> -
> -	if (oid !=3D OID_TPMSealedData) {
> +	struct tpm2_key *key =3D context;
> +
> +	switch (oid) {
> +	case OID_TPMSealedData:
> +		pr_info("TPMSealedData\n");
> +		break;
> +	case OID_TPMLoadableKey:
> +		pr_info("TPMLodableKey\n");
> +		break;
> +	default:
>  		char buffer[50];
> -
>  		sprint_oid(value, vlen, buffer, sizeof(buffer));
>  		pr_debug("OID is \"%s\" which is not TPMSealedData\n",
>  			 buffer);

Maybe extend this print to say "neither TPMSealedData nor TPMLodableKey"

Thanks
-Bharat

>  		return -EINVAL;
>  	}
>=20
> +	key->oid =3D oid;
>  	return 0;
>  }
>=20
> diff --git a/include/crypto/tpm2_key.h b/include/crypto/tpm2_key.h
> index acf41b2e0c92..2d2434233000 100644
> --- a/include/crypto/tpm2_key.h
> +++ b/include/crypto/tpm2_key.h
> @@ -2,12 +2,14 @@
>  #ifndef __LINUX_TPM2_KEY_H__
>  #define __LINUX_TPM2_KEY_H__
>=20
> +#include <linux/oid_registry.h>
>  #include <linux/slab.h>
>=20
>  /*
>   * TPM2 ASN.1 key
>   */
>  struct tpm2_key {
> +	enum OID oid;
>  	u32 parent;
>  	const u8 *blob;
>  	u32 blob_len;
> diff --git a/security/keys/trusted-keys/trusted_tpm2.c
> b/security/keys/trusted-keys/trusted_tpm2.c
> index f255388d32b8..ce4c667c3ee3 100644
> --- a/security/keys/trusted-keys/trusted_tpm2.c
> +++ b/security/keys/trusted-keys/trusted_tpm2.c
> @@ -305,6 +305,10 @@ static int tpm2_load_cmd(struct tpm_chip *chip,
>  		payload->old_format =3D 1;
>  	} else {
>  		blob =3D key.blob;
> +		if (key.oid !=3D OID_TPMSealedData) {
> +			tpm2_key_destroy(&key);
> +			return -EINVAL;
> +		}
>  	}
>=20
>  	if (!blob)
> --
> 2.45.1
>=20