From nobody Fri Sep 25 16:50:49 2026 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 smtp.subspace.kernel.org (Postfix) with ESMTPS id 9ECF43D3339; Thu, 10 Sep 2026 07:53:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789026809; cv=none; b=OiIbuGgj2kl7WS2pclk+33PBSilxWYjeNAC7ja8R0pHjKp7a6dN4sO/jikNr9KJ0dRHBthRkg11ds9Gd/mt8b/fmHmKDFtDKx3C+k8LtISrzIxgUlOtamOltSdAGs76yTMogVilZHNmDchoAon4PK3oC+GSO8Zk9zleCTA3CD/U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789026809; c=relaxed/simple; bh=VWliHbAyNsfQkTLue9pckqYn2hIoO3+6LJlxdUoTPaQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VkG1FmJa5/lnMZLxVwrVKMdVs7NQwIxkxMgK08YrT+VVJX+w3lw27qvMGjmb93978myq+uQH1nYUxDvwEevgSsZDRacSExvBiuzv18+gkMaP4Vypd44+1B/OBnphECdv49JL4TDsKEfi6zbeoNQ7wT3cVababG/Ep3Vp3u8Qhmg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=jvB+RFz2; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="jvB+RFz2" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68A5Ve8m1973909; Thu, 10 Sep 2026 07:53:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=lVQVUZ0Ep4SayKCfM +/Hw8LgKHBJ2yc3PzwStLnYwVQ=; b=jvB+RFz2SRvAc0V6TwPLVgAuepaMAqyA9 ERktgk9TbfyDxPqwqGGSVmLitYFITtq0sHqw4HkkTGQmzEOmpfIoYEWnbQVz8kCw /AfNCa2xCfxTYaGYed1Tui2hivnl/oQ260J2OJycgFIDiTNsC3SCFrfBWrVpzhau XIyEBWGA/UyWy9FaqY6MZgE4RWzRAFXOoRZtDo71PLrSS0aHzuCvCiMmFD5Eq5o7 MOVin/JdzLtXP28sUq3O2RNTIAkkyat9dIbY2MfOlzIG2Jlf5zCi7kSJvQ7l7ppD NGdskS6ZQ1pDkyVk0WNdPzkCg4AP6fM459Qn4sdOd0mxBcrrzE1iA== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4gkd8pk4w5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 10 Sep 2026 07:53:25 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 68A7fQgW016952; Thu, 10 Sep 2026 07:53:24 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4gkcr33694-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 10 Sep 2026 07:53:24 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68A7rLap43254190 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Sep 2026 07:53:21 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E95582004B; Thu, 10 Sep 2026 07:53:20 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F04B720049; Thu, 10 Sep 2026 07:53:17 +0000 (GMT) Received: from li-fc74f8cc-3279-11b2-a85c-ef5828687581.bl1-in.ibm.com (unknown [9.123.14.23]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 10 Sep 2026 07:53:17 +0000 (GMT) From: Srish Srinivasan To: linux-integrity@vger.kernel.org, keyrings@vger.kernel.org Cc: James.Bottomley@HansenPartnership.com, jarkko@kernel.org, zohar@linux.ibm.com, stefanb@linux.ibm.com, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, nayna@linux.ibm.com, rnsastry@linux.ibm.com, ssrish@linux.ibm.com, stable@vger.kernel.org Subject: [PATCH v3 1/2] keys/trusted_keys: return immediately after TPM unseal failure Date: Thu, 10 Sep 2026 13:22:31 +0530 Message-ID: <20260910075232.178855-2-ssrish@linux.ibm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260910075232.178855-1-ssrish@linux.ibm.com> References: <20260910075232.178855-1-ssrish@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=eM2GH3p1 c=1 sm=1 tr=0 ts=6aa261f5 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=Gb-tKBqSAOq4cnd-bv4A:9 X-Proofpoint-ORIG-GUID: W4rNDHD9n96vMXGGrJCraWHdre9UZai- X-Proofpoint-GUID: W4rNDHD9n96vMXGGrJCraWHdre9UZai- X-Proofpoint-Spam-Info: AW1haW4tMjYwOTEwMDA4MSBTYWx0ZWRfXwgxHNo5wYSox +hHgx3HU9ZZRwLZkYIHLC4iPbq0fYxDlBYdGrca7YFQfMjNMCCzzGkue/2tJMWHR/6I/oBKMQpJ GYW5ZFx1aZ0O7yrKDA7xUfhEK+yuvYU= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTEwMDA4MSBTYWx0ZWRfX6tstTj+ScFn+ Yh+ahFlo8Jc2mgp8DeArRiivwBG/HittagYJODfvPCMNQWV2KoUfiLY94ey+/T0rHP504+YiQm5 p9bVqi2bs+7mMhdcUQp+oSdR1bPYpalYfuAHAwR1n2J/mv5jA41y/yuFq+Rv+bfvSvtH/Siu9G+ DpQkYz83h3U2uwcV4UfL7ARkNiCvhXKX2oISkwouelED2ing1nCNb64igsoQN4gUJPeKquBxEtC KpvRYRRDuC8HizMzfsnp0+69rRR6p1L+ejkyULTjCbir7PSvUKnguaJIdaBsQ239Jqyj+3oW/hW FY7ugul2YrwjIOsD2tLnJaoA/htgssjJXQVk6LXv87od5ZjYbh/79tR7Jj4H++qnolmpR3snNCi cKE7dTMILJ0biv68UqnvJyRNzAxGreP9B3+bqk2yGguhEwv7lvxbG7a60Bq9Rw1TjRcDoiMz5LR iTtjIv1b0C86Ti8WjNw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-10_02,2026-09-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 malwarescore=0 adultscore=0 phishscore=0 lowpriorityscore=0 suspectscore=0 spamscore=0 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609100081 Content-Type: text/plain; charset="utf-8" trusted_tpm_unseal() proceeds to pcrlock() when the TPM unseal operation fails. If pcrlock() succeeds, its return value overwrites the unseal error, causing key instantiation to succeed. Return immediately when unseal fails to preserve the original error. Fixes: 5d0682be3189 ("KEYS: trusted: Add generic trusted keys framework") Cc: stable@vger.kernel.org Signed-off-by: Srish Srinivasan Reviewed-by: Jarkko Sakkinen --- security/keys/trusted-keys/trusted_tpm1.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trus= ted-keys/trusted_tpm1.c index bf0bf7f36970..9cdfeea800a3 100644 --- a/security/keys/trusted-keys/trusted_tpm1.c +++ b/security/keys/trusted-keys/trusted_tpm1.c @@ -923,8 +923,10 @@ static int trusted_tpm_unseal(struct trusted_key_paylo= ad *p, char *datablob) ret =3D tpm2_unseal_trusted(chip, p, options); else ret =3D key_unseal(p, options); - if (ret < 0) + if (ret < 0) { pr_info("key_unseal failed (%d)\n", ret); + goto out; + } =20 if (options->pcrlock) { ret =3D pcrlock(options->pcrlock); --=20 2.53.0 From nobody Fri Sep 25 16:50:49 2026 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 smtp.subspace.kernel.org (Postfix) with ESMTPS id C5F17392819; Thu, 10 Sep 2026 07:53:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789026817; cv=none; b=WJd89mnoTVT9edhjUTznSrTZfOkuRASrTFnwhDwuUs6faVfCJs5wslyQ9BYFdHQCt6zVRTaDyIrGKbggPKEq2TcVPovzikp0Ka+iBgpKAcjxT8qCRdqKv/m7eoq2mO0/34uN/OzuMt9tQRFye7lxpgm2acHer2MqJOEi93oVxiI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789026817; c=relaxed/simple; bh=n6gELM1P1isGCunopjwYnUVGN92+NBCAomUlpZhDVFk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KUkSP07e+UbkZa27ceqpG0nxj6dlDK1XXm9GMkyajDAEI8+Oh/oNZtXDQhwaOlzKLMj6q9E3q3gS5Ja31h2pa9R+hyMbJuRSyUGVbrIXgVc2ZE0sDVSUR86Y+5gu/0/gobW7fPbw1ujO9OMcgslhYL+DSnh/M9n4vEjQB1DJ6/8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=hh5BnYou; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="hh5BnYou" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68A5VSeK1973316; Thu, 10 Sep 2026 07:53:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=7ynf5N1Zb5X+vW1Pm QoG3Wa4YeqC4P/zB/gOjUAxw1Y=; b=hh5BnYouxIbF+Yfbdtv6I+QavSXn9cep3 zJxpvZqrzGgd82TpSnj2lIE59VvCJ2DyeV5nUQOzjZVitgkHZSWAkdzE8nwidhh5 AV7SaolG+/IyTjn8iShDi1OCEtQgDKwVGUuPBVgYfjbfCRwtobfh4hVjklC2WMpi tFLA3bKHyCkbiSVlYT9aoi+IiCiFRyxxkhTjRkJQKWnI4C60GTNWIAo7sn4GzBLs ExcyhwdrkIJ+rSGBDKJEDhVu1hJCtnXZ3/zvD27oy6tqUw4ZUbKZWatKjOsbQj6o u7vuQmqz6Opby1e9B7LKyBxtEKP3YdqqotmTttctVftPC1nh2uyYw== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4gkd8pk4wj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 10 Sep 2026 07:53:32 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 68A7fE3G032693; Thu, 10 Sep 2026 07:53:31 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4gkcr3k6d2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 10 Sep 2026 07:53:31 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68A7rPla12648760 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Sep 2026 07:53:25 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8888F2004B; Thu, 10 Sep 2026 07:53:25 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C1F8220040; Thu, 10 Sep 2026 07:53:22 +0000 (GMT) Received: from li-fc74f8cc-3279-11b2-a85c-ef5828687581.bl1-in.ibm.com (unknown [9.123.14.23]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 10 Sep 2026 07:53:22 +0000 (GMT) From: Srish Srinivasan To: linux-integrity@vger.kernel.org, keyrings@vger.kernel.org Cc: James.Bottomley@HansenPartnership.com, jarkko@kernel.org, zohar@linux.ibm.com, stefanb@linux.ibm.com, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, nayna@linux.ibm.com, rnsastry@linux.ibm.com, ssrish@linux.ibm.com Subject: [PATCH v8 2/2] keys/trusted_keys: move TPM-specific fields into struct trusted_key_tpm Date: Thu, 10 Sep 2026 13:22:32 +0530 Message-ID: <20260910075232.178855-3-ssrish@linux.ibm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260910075232.178855-1-ssrish@linux.ibm.com> References: <20260910075232.178855-1-ssrish@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=eM2GH3p1 c=1 sm=1 tr=0 ts=6aa261fc cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=VwQbUJbxAAAA:8 a=jlqkl6CpOdNBEKQX7CEA:9 X-Proofpoint-ORIG-GUID: C32AxEYoBU7VyIGI47Xut2uBAEm9Jz72 X-Proofpoint-GUID: C32AxEYoBU7VyIGI47Xut2uBAEm9Jz72 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTEwMDA4MSBTYWx0ZWRfX4tBYi78ZnmpU bDCzGOjj8JdW8BWDf04fN8Pvo5/N34AgjuO50diiiKxh7e5hSyl+ITnwWpAiU/zgv2GLcxd2xNz nOaWfXWi8FhXaepBNwVfjPn1YSfkBNc= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTEwMDA4MSBTYWx0ZWRfX9pL41G4UIces tEDRvxJpnBdbmjEPG9l4766gVAzu519Lvf2fYyRnqnjvEoz2YDgnTHrYt/ValwPNXxR8evt8Ydz 0gcsXfM0lxjPFizBNrDuJX4Zg/L5v6LVxeZM+4UZsvDssNq06WE+2ChgD69BC1kTBEj5ZkrlKfS 7cHP31HkX8OrlFNvcBIAYq/iSvvUeJ5m9RLqfKAKKhrB4kXxCPnzdetaqRmEKSkn/aZK46Psajr QUZBpoxDwZgZmDncxs2otOh1ynamoMfyY8mxLUolNWF4nXwKZAikZslTGRsWSPHAuwi+O9GABsD 4dWE5/mERfA3UijWEr9D5itgw1qm586K5K5fsNpkn4pAZao0b+AXrnTY3rwHTPcAjwO7Ej8m6rP WiFDcLA2K87ICT+mBkO6WKVWY7t6J/NB2JKvcSLsnJg7K1ngT01TgKpbv/vAFcGwj3I10IAQJpL tRncDALdGshEQVoYgqQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-10_02,2026-09-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 malwarescore=0 adultscore=0 phishscore=0 lowpriorityscore=0 suspectscore=0 spamscore=0 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609100081 Content-Type: text/plain; charset="utf-8" The trusted_key_options struct contains TPM-specific fields (keyhandle, keyauth, blobauth_len, blobauth, pcrinfo_len, pcrinfo, pcrlock, hash, policydigest_len, policydigest, and policyhandle). This leads to the accumulation of backend-specific fields in the generic options structure. Define struct trusted_key_tpm and move the TPM-specific fields there. Store a pointer to it in the private member of struct trusted_key_options. Signed-off-by: Srish Srinivasan Reviewed-by: Stefan Berger Reviewed-by: Jarkko Sakkinen --- include/keys/trusted-type.h | 11 -- include/keys/trusted_tpm.h | 14 +++ security/keys/trusted-keys/trusted_tpm1.c | 123 ++++++++++++---------- security/keys/trusted-keys/trusted_tpm2.c | 50 +++++---- 4 files changed, 111 insertions(+), 87 deletions(-) diff --git a/include/keys/trusted-type.h b/include/keys/trusted-type.h index 9f9940482da4..3db61b57cf73 100644 --- a/include/keys/trusted-type.h +++ b/include/keys/trusted-type.h @@ -39,17 +39,6 @@ struct trusted_key_payload { =20 struct trusted_key_options { uint16_t keytype; - uint32_t keyhandle; - unsigned char keyauth[TPM_DIGEST_SIZE]; - uint32_t blobauth_len; - unsigned char blobauth[TPM_DIGEST_SIZE]; - uint32_t pcrinfo_len; - unsigned char pcrinfo[MAX_PCRINFO_SIZE]; - int pcrlock; - uint32_t hash; - uint32_t policydigest_len; - unsigned char policydigest[MAX_DIGEST_SIZE]; - uint32_t policyhandle; void *private; }; =20 diff --git a/include/keys/trusted_tpm.h b/include/keys/trusted_tpm.h index 3a0fa3bc8454..dafbd4a84ddd 100644 --- a/include/keys/trusted_tpm.h +++ b/include/keys/trusted_tpm.h @@ -6,6 +6,20 @@ =20 extern struct trusted_key_ops trusted_key_tpm_ops; =20 +struct trusted_key_tpm { + uint32_t keyhandle; + unsigned char keyauth[TPM_DIGEST_SIZE]; + uint32_t blobauth_len; + unsigned char blobauth[TPM_DIGEST_SIZE]; + uint32_t pcrinfo_len; + unsigned char pcrinfo[MAX_PCRINFO_SIZE]; + int pcrlock; + uint32_t hash; + uint32_t policydigest_len; + unsigned char policydigest[MAX_DIGEST_SIZE]; + uint32_t policyhandle; +}; + int tpm2_seal_trusted(struct tpm_chip *chip, struct trusted_key_payload *payload, struct trusted_key_options *options); diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trus= ted-keys/trusted_tpm1.c index 9cdfeea800a3..3ec078ca3f97 100644 --- a/security/keys/trusted-keys/trusted_tpm1.c +++ b/security/keys/trusted-keys/trusted_tpm1.c @@ -48,15 +48,17 @@ enum { #ifdef CONFIG_TRUSTED_KEYS_DEBUG static inline void dump_options(struct trusted_key_options *o) { + struct trusted_key_tpm *private =3D o->private; + if (!trusted_debug) return; =20 pr_debug("sealing key type %d\n", o->keytype); - pr_debug("sealing key handle %0X\n", o->keyhandle); - pr_debug("pcrlock %d\n", o->pcrlock); - pr_debug("pcrinfo %d\n", o->pcrinfo_len); + pr_debug("sealing key handle %0X\n", private->keyhandle); + pr_debug("pcrlock %d\n", private->pcrlock); + pr_debug("pcrinfo %d\n", private->pcrinfo_len); print_hex_dump_debug("pcrinfo ", DUMP_PREFIX_NONE, - 16, 1, o->pcrinfo, o->pcrinfo_len, 0); + 16, 1, private->pcrinfo, private->pcrinfo_len, 0); } =20 static inline void dump_sess(struct osapsess *s) @@ -626,6 +628,7 @@ static int tpm_unseal(struct tpm_buf *tb, static int key_seal(struct trusted_key_payload *p, struct trusted_key_options *o) { + struct trusted_key_tpm *private =3D o->private; int ret; =20 struct tpm_buf *tb __free(kfree) =3D kzalloc(TPM_BUFSIZE, GFP_KERNEL); @@ -637,9 +640,10 @@ static int key_seal(struct trusted_key_payload *p, /* include migratable flag at end of sealed key */ p->key[p->key_len] =3D p->migratable; =20 - ret =3D tpm_seal(tb, o->keytype, o->keyhandle, o->keyauth, + ret =3D tpm_seal(tb, o->keytype, private->keyhandle, private->keyauth, p->key, p->key_len + 1, p->blob, &p->blob_len, - o->blobauth, o->pcrinfo, o->pcrinfo_len); + private->blobauth, private->pcrinfo, + private->pcrinfo_len); if (ret < 0) pr_info("srkseal failed (%d)\n", ret); =20 @@ -652,6 +656,7 @@ static int key_seal(struct trusted_key_payload *p, static int key_unseal(struct trusted_key_payload *p, struct trusted_key_options *o) { + struct trusted_key_tpm *private =3D o->private; int ret; =20 struct tpm_buf *tb __free(kfree) =3D kzalloc(TPM_BUFSIZE, GFP_KERNEL); @@ -660,8 +665,8 @@ static int key_unseal(struct trusted_key_payload *p, =20 tpm_buf_init(tb, TPM_BUFSIZE); =20 - ret =3D tpm_unseal(tb, o->keyhandle, o->keyauth, p->blob, p->blob_len, - o->blobauth, p->key, &p->key_len); + ret =3D tpm_unseal(tb, private->keyhandle, private->keyauth, p->blob, + p->blob_len, private->blobauth, p->key, &p->key_len); if (ret < 0) pr_info("srkunseal failed (%d)\n", ret); else @@ -697,6 +702,7 @@ static const match_table_t key_tokens =3D { static int getoptions(char *c, struct trusted_key_payload *pay, struct trusted_key_options *opt) { + struct trusted_key_tpm *private =3D opt->private; substring_t args[MAX_OPT_ARGS]; char *p =3D c; int token; @@ -712,7 +718,7 @@ static int getoptions(char *c, struct trusted_key_paylo= ad *pay, if (tpm2 < 0) return tpm2; =20 - opt->hash =3D tpm2 ? HASH_ALGO_SHA256 : HASH_ALGO_SHA1; + private->hash =3D tpm2 ? HASH_ALGO_SHA256 : HASH_ALGO_SHA1; =20 if (!c) return 0; @@ -726,11 +732,11 @@ static int getoptions(char *c, struct trusted_key_pay= load *pay, =20 switch (token) { case Opt_pcrinfo: - opt->pcrinfo_len =3D strlen(args[0].from) / 2; - if (opt->pcrinfo_len > MAX_PCRINFO_SIZE) + private->pcrinfo_len =3D strlen(args[0].from) / 2; + if (private->pcrinfo_len > MAX_PCRINFO_SIZE) return -EINVAL; - res =3D hex2bin(opt->pcrinfo, args[0].from, - opt->pcrinfo_len); + res =3D hex2bin(private->pcrinfo, args[0].from, + private->pcrinfo_len); if (res < 0) return -EINVAL; break; @@ -739,12 +745,12 @@ static int getoptions(char *c, struct trusted_key_pay= load *pay, if (res < 0) return -EINVAL; opt->keytype =3D SEAL_keytype; - opt->keyhandle =3D handle; + private->keyhandle =3D handle; break; case Opt_keyauth: if (strlen(args[0].from) !=3D 2 * SHA1_DIGEST_SIZE) return -EINVAL; - res =3D hex2bin(opt->keyauth, args[0].from, + res =3D hex2bin(private->keyauth, args[0].from, SHA1_DIGEST_SIZE); if (res < 0) return -EINVAL; @@ -755,21 +761,23 @@ static int getoptions(char *c, struct trusted_key_pay= load *pay, * hex strings. TPM 2.0 authorizations are simple * passwords (although it can take a hash as well) */ - opt->blobauth_len =3D strlen(args[0].from); + private->blobauth_len =3D strlen(args[0].from); =20 - if (opt->blobauth_len =3D=3D 2 * TPM_DIGEST_SIZE) { - res =3D hex2bin(opt->blobauth, args[0].from, + if (private->blobauth_len =3D=3D 2 * TPM_DIGEST_SIZE) { + res =3D hex2bin(private->blobauth, args[0].from, TPM_DIGEST_SIZE); if (res < 0) return -EINVAL; =20 - opt->blobauth_len =3D TPM_DIGEST_SIZE; + private->blobauth_len =3D TPM_DIGEST_SIZE; break; } =20 - if (tpm2 && opt->blobauth_len <=3D sizeof(opt->blobauth)) { - memcpy(opt->blobauth, args[0].from, - opt->blobauth_len); + if (tpm2 && + private->blobauth_len <=3D + sizeof(private->blobauth)) { + memcpy(private->blobauth, args[0].from, + private->blobauth_len); break; } =20 @@ -787,14 +795,14 @@ static int getoptions(char *c, struct trusted_key_pay= load *pay, res =3D kstrtoul(args[0].from, 10, &lock); if (res < 0) return -EINVAL; - opt->pcrlock =3D lock; + private->pcrlock =3D lock; break; case Opt_hash: if (test_bit(Opt_policydigest, &token_mask)) return -EINVAL; for (i =3D 0; i < HASH_ALGO__LAST; i++) { if (!strcmp(args[0].from, hash_algo_name[i])) { - opt->hash =3D i; + private->hash =3D i; break; } } @@ -806,14 +814,14 @@ static int getoptions(char *c, struct trusted_key_pay= load *pay, } break; case Opt_policydigest: - digest_len =3D hash_digest_size[opt->hash]; + digest_len =3D hash_digest_size[private->hash]; if (!tpm2 || strlen(args[0].from) !=3D (2 * digest_len)) return -EINVAL; - res =3D hex2bin(opt->policydigest, args[0].from, + res =3D hex2bin(private->policydigest, args[0].from, digest_len); if (res < 0) return -EINVAL; - opt->policydigest_len =3D digest_len; + private->policydigest_len =3D digest_len; break; case Opt_policyhandle: if (!tpm2) @@ -821,7 +829,7 @@ static int getoptions(char *c, struct trusted_key_paylo= ad *pay, res =3D kstrtoul(args[0].from, 16, &handle); if (res < 0) return -EINVAL; - opt->policyhandle =3D handle; + private->policyhandle =3D handle; break; default: return -EINVAL; @@ -832,6 +840,7 @@ static int getoptions(char *c, struct trusted_key_paylo= ad *pay, =20 static struct trusted_key_options *trusted_options_alloc(void) { + struct trusted_key_tpm *private; struct trusted_key_options *options; int tpm2; =20 @@ -844,15 +853,23 @@ static struct trusted_key_options *trusted_options_al= loc(void) /* set any non-zero defaults */ options->keytype =3D SRK_keytype; =20 - if (!tpm2) - options->keyhandle =3D SRKHANDLE; + private =3D kzalloc_obj(*private); + if (!private) { + kfree_sensitive(options); + options =3D NULL; + } else { + if (!tpm2) + private->keyhandle =3D SRKHANDLE; + options->private =3D private; + } } return options; } =20 static int trusted_tpm_seal(struct trusted_key_payload *p, char *datablob) { - struct trusted_key_options *options =3D NULL; + struct trusted_key_options *options __free(kfree_sensitive) =3D NULL; + struct trusted_key_tpm *private __free(kfree_sensitive) =3D NULL; int ret =3D 0; int tpm2; =20 @@ -864,15 +881,15 @@ static int trusted_tpm_seal(struct trusted_key_payloa= d *p, char *datablob) if (!options) return -ENOMEM; =20 + private =3D options->private; + ret =3D getoptions(datablob, p, options); if (ret < 0) - goto out; + return ret; dump_options(options); =20 - if (!options->keyhandle && !tpm2) { - ret =3D -EINVAL; - goto out; - } + if (!private->keyhandle && !tpm2) + return -EINVAL; =20 if (tpm2) ret =3D tpm2_seal_trusted(chip, p, options); @@ -880,24 +897,24 @@ static int trusted_tpm_seal(struct trusted_key_payloa= d *p, char *datablob) ret =3D key_seal(p, options); if (ret < 0) { pr_info("key_seal failed (%d)\n", ret); - goto out; + return ret; } =20 - if (options->pcrlock) { - ret =3D pcrlock(options->pcrlock); + if (private->pcrlock) { + ret =3D pcrlock(private->pcrlock); if (ret < 0) { pr_info("pcrlock failed (%d)\n", ret); - goto out; + return ret; } } -out: - kfree_sensitive(options); + return ret; } =20 static int trusted_tpm_unseal(struct trusted_key_payload *p, char *datablo= b) { - struct trusted_key_options *options =3D NULL; + struct trusted_key_options *options __free(kfree_sensitive) =3D NULL; + struct trusted_key_tpm *private __free(kfree_sensitive) =3D NULL; int ret =3D 0; int tpm2; =20 @@ -908,16 +925,15 @@ static int trusted_tpm_unseal(struct trusted_key_payl= oad *p, char *datablob) options =3D trusted_options_alloc(); if (!options) return -ENOMEM; + private =3D options->private; =20 ret =3D getoptions(datablob, p, options); if (ret < 0) - goto out; + return ret; dump_options(options); =20 - if (!options->keyhandle && !tpm2) { - ret =3D -EINVAL; - goto out; - } + if (!private->keyhandle && !tpm2) + return -EINVAL; =20 if (tpm2) ret =3D tpm2_unseal_trusted(chip, p, options); @@ -925,18 +941,17 @@ static int trusted_tpm_unseal(struct trusted_key_payl= oad *p, char *datablob) ret =3D key_unseal(p, options); if (ret < 0) { pr_info("key_unseal failed (%d)\n", ret); - goto out; + return ret; } =20 - if (options->pcrlock) { - ret =3D pcrlock(options->pcrlock); + if (private->pcrlock) { + ret =3D pcrlock(private->pcrlock); if (ret < 0) { pr_info("pcrlock failed (%d)\n", ret); - goto out; + return ret; } } -out: - kfree_sensitive(options); + return ret; } =20 diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trus= ted-keys/trusted_tpm2.c index 01f18bb37047..c2a69bcf381d 100644 --- a/security/keys/trusted-keys/trusted_tpm2.c +++ b/security/keys/trusted-keys/trusted_tpm2.c @@ -23,6 +23,7 @@ static int tpm2_key_encode(struct trusted_key_payload *pa= yload, struct trusted_key_options *options, u8 *src, u32 len) { + struct trusted_key_tpm *private =3D options->private; const int SCRATCH_SIZE =3D PAGE_SIZE; u8 *scratch =3D kmalloc(SCRATCH_SIZE, GFP_KERNEL); u8 *work =3D scratch, *work1; @@ -45,7 +46,7 @@ static int tpm2_key_encode(struct trusted_key_payload *pa= yload, work =3D asn1_encode_oid(work, end_work, tpm2key_oid, asn1_oid_len(tpm2key_oid)); =20 - if (options->blobauth_len =3D=3D 0) { + if (private->blobauth_len =3D=3D 0) { unsigned char bool[3], *w =3D bool; /* tag 0 is emptyAuth */ w =3D asn1_encode_boolean(w, w + sizeof(bool), true); @@ -68,7 +69,7 @@ static int tpm2_key_encode(struct trusted_key_payload *pa= yload, goto err; } =20 - work =3D asn1_encode_integer(work, end_work, options->keyhandle); + work =3D asn1_encode_integer(work, end_work, private->keyhandle); work =3D asn1_encode_octet_string(work, end_work, pub, pub_len); work =3D asn1_encode_octet_string(work, end_work, priv, priv_len); =20 @@ -101,6 +102,7 @@ static int tpm2_key_decode(struct trusted_key_payload *= payload, struct trusted_key_options *options, u8 **buf, unsigned int *blob_len) { + struct trusted_key_tpm *private =3D options->private; int ret; struct tpm2_key_context ctx; u8 *blob; @@ -121,7 +123,7 @@ static int tpm2_key_decode(struct trusted_key_payload *= payload, =20 *buf =3D blob; *blob_len =3D ctx.priv_len + ctx.pub_len; - options->keyhandle =3D ctx.parent; + private->keyhandle =3D ctx.parent; =20 memcpy(blob, ctx.priv, ctx.priv_len); blob +=3D ctx.priv_len; @@ -233,6 +235,7 @@ int tpm2_seal_trusted(struct tpm_chip *chip, struct trusted_key_payload *payload, struct trusted_key_options *options) { + struct trusted_key_tpm *private =3D options->private; off_t offset =3D TPM_HEADER_SIZE; struct tpm_buf *buf __free(kfree) =3D NULL; struct tpm_buf *sized __free(kfree) =3D NULL; @@ -241,11 +244,11 @@ int tpm2_seal_trusted(struct tpm_chip *chip, u32 flags; int rc; =20 - hash =3D tpm2_find_hash_alg(options->hash); + hash =3D tpm2_find_hash_alg(private->hash); if (hash < 0) return hash; =20 - if (!options->keyhandle) + if (!private->keyhandle) return -EINVAL; =20 rc =3D tpm_try_get_ops(chip); @@ -275,18 +278,18 @@ int tpm2_seal_trusted(struct tpm_chip *chip, =20 tpm_buf_init_sized(sized, TPM_BUFSIZE); =20 - rc =3D tpm_buf_append_name(chip, buf, options->keyhandle, NULL); + rc =3D tpm_buf_append_name(chip, buf, private->keyhandle, NULL); if (rc) goto out; =20 tpm_buf_append_hmac_session(chip, buf, TPM2_SA_DECRYPT, - options->keyauth, TPM_DIGEST_SIZE); + private->keyauth, TPM_DIGEST_SIZE); =20 /* sensitive */ - tpm_buf_append_u16(sized, options->blobauth_len); + tpm_buf_append_u16(sized, private->blobauth_len); =20 - if (options->blobauth_len) - tpm_buf_append(sized, options->blobauth, options->blobauth_len); + if (private->blobauth_len) + tpm_buf_append(sized, private->blobauth, private->blobauth_len); =20 tpm_buf_append_u16(sized, payload->key_len); tpm_buf_append(sized, payload->key, payload->key_len); @@ -299,14 +302,15 @@ int tpm2_seal_trusted(struct tpm_chip *chip, =20 /* key properties */ flags =3D 0; - flags |=3D options->policydigest_len ? 0 : TPM2_OA_USER_WITH_AUTH; + flags |=3D private->policydigest_len ? 0 : TPM2_OA_USER_WITH_AUTH; flags |=3D payload->migratable ? 0 : (TPM2_OA_FIXED_TPM | TPM2_OA_FIXED_P= ARENT); tpm_buf_append_u32(sized, flags); =20 /* policy */ - tpm_buf_append_u16(sized, options->policydigest_len); - if (options->policydigest_len) - tpm_buf_append(sized, options->policydigest, options->policydigest_len); + tpm_buf_append_u16(sized, private->policydigest_len); + if (private->policydigest_len) + tpm_buf_append(sized, private->policydigest, + private->policydigest_len); =20 /* public parameters */ tpm_buf_append_u16(sized, TPM_ALG_NULL); @@ -377,6 +381,7 @@ static int tpm2_load_cmd(struct tpm_chip *chip, u32 *blob_handle) { u8 *blob_ref __free(kfree) =3D NULL; + struct trusted_key_tpm *private =3D options->private; struct tpm_buf *buf __free(kfree) =3D NULL; unsigned int private_len; unsigned int public_len; @@ -397,7 +402,7 @@ static int tpm2_load_cmd(struct tpm_chip *chip, } =20 /* new format carries keyhandle but old format doesn't */ - if (!options->keyhandle) + if (!private->keyhandle) return -EINVAL; =20 /* must be big enough for at least the two be16 size counts */ @@ -441,11 +446,11 @@ static int tpm2_load_cmd(struct tpm_chip *chip, tpm_buf_init(buf, TPM_BUFSIZE); tpm_buf_reset(buf, TPM2_ST_SESSIONS, TPM2_CC_LOAD); =20 - rc =3D tpm_buf_append_name(chip, buf, options->keyhandle, NULL); + rc =3D tpm_buf_append_name(chip, buf, private->keyhandle, NULL); if (rc) return rc; =20 - tpm_buf_append_hmac_session(chip, buf, 0, options->keyauth, + tpm_buf_append_hmac_session(chip, buf, 0, private->keyauth, TPM_DIGEST_SIZE); =20 tpm_buf_append(buf, blob, blob_len); @@ -485,6 +490,7 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip, struct trusted_key_options *options, u32 blob_handle) { + struct trusted_key_tpm *private =3D options->private; struct tpm_header *head; struct tpm_buf *buf __free(kfree) =3D NULL; u16 data_len; @@ -509,10 +515,10 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip, if (rc) return rc; =20 - if (!options->policyhandle) { + if (!private->policyhandle) { tpm_buf_append_hmac_session(chip, buf, TPM2_SA_ENCRYPT, - options->blobauth, - options->blobauth_len); + private->blobauth, + private->blobauth_len); } else { /* * FIXME: The policy session was generated outside the @@ -525,9 +531,9 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip, * could repeat our actions with the exfiltrated * password. */ - tpm2_buf_append_auth(buf, options->policyhandle, + tpm2_buf_append_auth(buf, private->policyhandle, NULL /* nonce */, 0, 0, - options->blobauth, options->blobauth_len); + private->blobauth, private->blobauth_len); if (tpm2_chip_auth(chip)) { tpm_buf_append_hmac_session(chip, buf, TPM2_SA_ENCRYPT, NULL, 0); --=20 2.53.0