From patchwork Thu May 23 21:25:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 798480 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D63AE129A7E; Thu, 23 May 2024 21:25:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716499532; cv=none; b=jSF0zYuA44M2pfm0CTmwN04r5UJxgEJ5eGMfPCAwKoE9g+YOIA2Jf3dxxhTjtIIq4hGQ0iGAPUnQ/JLk9xCix9qOP6ZDLSKgob9u0pfX0ygGr/fvUyXHfri4LRnbGeJ05EampQ7ZUbOh89pOvcqIIWhhV0IMI8X6eAlIQPgAoIE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716499532; c=relaxed/simple; bh=mZRcz9OSsK8uHOdUCIoBp+dhRpamjTsxuYIFBW19txc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bE0vCS0p9YgY/XpXEj4bKr2K4D6NS5reaohvUtUIuXRPwVojyk/qWoV4NqW0GATYD+tG7U/aGlvZh7UoVvlKSN3F54nRUJjOXI7YGxzwbco0x3AaIAWg/QWPi2MEej2nCa7j9NlJ+h2DloHoRA7GBgdbcUBes58fndsL+vjarHw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BumYdKQn; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BumYdKQn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D3A8C2BD10; Thu, 23 May 2024 21:25:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716499531; bh=mZRcz9OSsK8uHOdUCIoBp+dhRpamjTsxuYIFBW19txc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BumYdKQnELuTPRp0l7eqQTH5Yufjq43sYVnyjnY7W9gEpJV/gnPl18raTcrnNtlzj LOGzW8xC6DTWvfUbRR2ILmN8/59LHkq9bmmJ9Vl+l9CE7TxzgSdzVsNht4+Pgr94a1 P7hFYB3HahWk4ALeyFLpxMt+9ng2XV+rluqRvDTjhOK+6jsZk18YpX5E2fL+Jy8PUu QoRnlNBQmh29lBQTyeXu8QfURqSPxBSyJFIei/kvmZRM8NAAYC5yxDCNdDC2OWOQ1m QBMcuqcLB6KJv+1eBKpVyuyXsweGpHDmB6h/0XdYg5OBdbsswF1o/XSmDXcK3XXj6F 4b4JvdlchD3aQ== From: Jarkko Sakkinen To: Herbert Xu Cc: linux-integrity@vger.kernel.org, keyrings@vger.kernel.org, Andreas.Fuchs@infineon.com, James Prestwood , David Woodhouse , Eric Biggers , James Bottomley , linux-crypto@vger.kernel.org, Jarkko Sakkinen , "David S. Miller" , linux-kernel@vger.kernel.org (open list), James Bottomley , Mimi Zohar , David Howells , Paul Moore , James Morris , "Serge E. Hallyn" , linux-security-module@vger.kernel.org (open list:SECURITY SUBSYSTEM) Subject: [PATCH v5 2/5] KEYS: trusted: Change -EINVAL to -E2BIG Date: Fri, 24 May 2024 00:25:03 +0300 Message-ID: <20240523212515.4875-3-jarkko@kernel.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240523212515.4875-1-jarkko@kernel.org> References: <20240523212515.4875-1-jarkko@kernel.org> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Report -E2BIG instead of -EINVAL when too large size for the key blob is requested. Signed-off-by: Jarkko Sakkinen --- security/keys/trusted-keys/trusted_tpm2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c index d478096cb5c1..7317e07440c3 100644 --- a/security/keys/trusted-keys/trusted_tpm2.c +++ b/security/keys/trusted-keys/trusted_tpm2.c @@ -122,7 +122,7 @@ static int tpm2_key_decode(struct trusted_key_payload *payload, return ret; if (ctx.priv_len + ctx.pub_len > MAX_BLOB_SIZE) - return -EINVAL; + return -E2BIG; blob = kmalloc(ctx.priv_len + ctx.pub_len + 4, GFP_KERNEL); if (!blob) From patchwork Thu May 23 21:25:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 798479 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C9437129E8F; Thu, 23 May 2024 21:25:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716499542; cv=none; b=mYkQv2H1A9k7xyaPYWkwlLl9H1wLXQzpVI78Wx0rnUXBP0FHwfZxcgva7zXmQbbP8eyw/vfAiFBKRIxvdrxODvLcS3vVQwzOkJeKC2tC36sJYOAjGxOGGa3VIGhqImXgo217yMahiFL3WSSe5OiZRT1pu5J4M/T/SWFTiZsfDXc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716499542; c=relaxed/simple; bh=bwx46fyxi21f4lcvrvEJTqeSya2jS+B+m4IM+zxLp1E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h+aY1VY6MywZ3NbYMzoTMHc45LpiwTXBKtZJU5ItEhl4s5GHEsSYNfGfeHnbcvSobsf5mSowdrkCPAFrGa/meAYwmRo9rJ0EYVQiFmOVOkSab6PhNsbi3e0hjfCCo/lJeuOdz4ZE6pDW0X+sCyANX4aIVLpArIQPQtHDo2gHJGI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Dqz8ifPL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Dqz8ifPL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06DF3C2BD10; Thu, 23 May 2024 21:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716499542; bh=bwx46fyxi21f4lcvrvEJTqeSya2jS+B+m4IM+zxLp1E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dqz8ifPLdAC3GfGmk+iFUDIJYQqDFZKz/rHwVow7krDMeCSi92Z3jvuJnR5ceYxj1 DHv9R1+hOfYxsGuV2ZrmOaE5rD+6NiD8KJS9yfkSS3sJJ+vILaZbFZgDwlUHjdIxu0 vDvImru48Z+xuT0jf2SFL5Ykhy4ujTInzztBw6VIVopGF53MjuECGB4hFB1tqmco+y oMr9tmZO7Bp55qDHTzprKeGKMCCC/vXLP1eym3eRqKoMJmEXhfbrLK1srcUCASIKdk oUulJ0Ow1p2ZXao4JBOuFtARibYlFAOJEZp542NuhQ7lWf8G1ouQHviuYtQVUos4gv Ry3+u3YepTBvg== From: Jarkko Sakkinen To: Herbert Xu Cc: linux-integrity@vger.kernel.org, keyrings@vger.kernel.org, Andreas.Fuchs@infineon.com, James Prestwood , David Woodhouse , Eric Biggers , James Bottomley , linux-crypto@vger.kernel.org, Jarkko Sakkinen , "David S. Miller" , linux-kernel@vger.kernel.org (open list), Peter Huewe , Jason Gunthorpe , James Bottomley , Mimi Zohar , David Howells , Paul Moore , James Morris , "Serge E. Hallyn" , linux-security-module@vger.kernel.org (open list:SECURITY SUBSYSTEM) Subject: [PATCH v5 4/5] tpm: tpm2_key: Extend parser to TPM_LoadableKey Date: Fri, 24 May 2024 00:25:05 +0300 Message-ID: <20240523212515.4875-5-jarkko@kernel.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240523212515.4875-1-jarkko@kernel.org> References: <20240523212515.4875-1-jarkko@kernel.org> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Extend parser to TPM_LoadableKey. Add field for oid to struct tpm2_key so that callers can differentiate different key types. Signed-off-by: Jarkko Sakkinen --- v3: * Fixup klog messages: https://lore.kernel.org/linux-integrity/SN7PR18MB53140F4341BC441C1C11586EE3EA2@SN7PR18MB5314.namprd18.prod.outlook.com/ --- drivers/char/tpm/tpm2_key.c | 17 ++++++++++++----- include/crypto/tpm2_key.h | 2 ++ security/keys/trusted-keys/trusted_tpm2.c | 4 ++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/drivers/char/tpm/tpm2_key.c b/drivers/char/tpm/tpm2_key.c index 7662b2cb85bf..b5c07288eff5 100644 --- a/drivers/char/tpm/tpm2_key.c +++ b/drivers/char/tpm/tpm2_key.c @@ -32,16 +32,23 @@ int tpm2_key_type(void *context, size_t hdrlen, const void *value, size_t vlen) { enum OID oid = look_up_OID(value, vlen); - - if (oid != OID_TPMSealedData) { + struct tpm2_key *key = context; + + switch (oid) { + case OID_TPMSealedData: + pr_debug("TPMSealedData\n"); + break; + case OID_TPMLoadableKey: + pr_debug("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); + pr_debug("Unknown OID \"%s\"\n", buffer); return -EINVAL; } + key->oid = oid; return 0; } 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__ +#include #include /* * 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 e0bd1a2fc2ca..5b4555dd13e5 100644 --- a/security/keys/trusted-keys/trusted_tpm2.c +++ b/security/keys/trusted-keys/trusted_tpm2.c @@ -303,6 +303,10 @@ static int tpm2_load_cmd(struct tpm_chip *chip, payload->old_format = 1; } else { blob = key.blob; + if (key.oid != OID_TPMSealedData) { + tpm2_key_destroy(&key); + return -EINVAL; + } } if (!blob)