From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 386524E4308; Wed, 30 Sep 2026 16:34:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790786057; cv=none; b=YwCAiqGMOoGDNXBueKIr+ZaIprpU0OYeCwHYjisqKoGdNsffzQpNKvVR6jrUxxuP7picKlv0Hl2ITyLamV4EQYWGQ0GwI4JZjtcc3+hU/txe7c6SEFOiSppewUCyfNCRB2pR9RmWuZJtnrCW9+byZq4j+c0C+xHUwF5U401Tuaw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790786057; c=relaxed/simple; bh=Ggn8aQ+Fyg0j9bQ763f4q9gcmQ2PztpnAkbFur7z8P8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I9HNlcncbWUX++g3TRO/tP6TL/A/Uf6L6P+O48rQZ1jkthnLuipeTZ0bUiXUduPniWVAAQm0U56ysIMSGtwo5tk12WWxL9QKJJ3Gf0UnGvvDrX8wREkP65H8Yj4qbCZF1wkNFqOkcBxCYmkHUIHNgrPHa55sNyCAVFrwVhLFPrY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ik3E2Ye1; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ik3E2Ye1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9167A1F000FF; Wed, 30 Sep 2026 16:34:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790786056; bh=o4J3kLy5l8AOTgyGobaidwWUa+oGx5Ngh89ejnGXJQs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ik3E2Ye1VYNIcCcH2zCX4+G4Bnwy617JbJjBA4Ru+XU6i3zHbX+6iOiAbCrdxzNFG jS2M1xieZISvITF1vYCpvZnjlJyeXy27HVFdgJ0qUDelLs5QaYf3+mfIQfPZB2NMKb CfoLw02a/i1cdFVkDQMiARTvGwyNon44yqPr2Ymk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, co+6a581c4284f721d4@bugs.sh, Stefano Garzarella , Srish Srinivasan , Jarkko Sakkinen Subject: [PATCH 6.1 725/982] KEYS: trusted: Fix tpm2_load_cmd() boundary check Date: Wed, 30 Sep 2026 17:24:21 +0200 Message-ID: <20260930152432.324243761@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152416.775402466@linuxfoundation.org> References: <20260930152416.775402466@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jarkko Sakkinen commit 114f00d738f15dd8c7318369edcdc53dd6d08763 upstream. tpm2_load_cmd() does boundary checks against the ASN.1 size i.e., payload->blob_len. Address this by passing the decoded blob size to tpm2_load_cmd(), and use it for the boundary checks. Cc: stable@vger.kernel.org # v5.13+ Fixes: f2219745250f ("security: keys: trusted: use ASN.1 TPM2 key format for the blobs") Reported-by: co+6a581c4284f721d4@bugs.sh Closes: https://bugs.sh/b/6a581c4284f721d4/ Reviewed-by: Stefano Garzarella Tested-by: Srish Srinivasan Link: https://lore.kernel.org/r/20260901205809.2028454-1-jarkko@kernel.org Signed-off-by: Jarkko Sakkinen Signed-off-by: Greg Kroah-Hartman --- security/keys/trusted-keys/trusted_tpm2.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) --- a/security/keys/trusted-keys/trusted_tpm2.c +++ b/security/keys/trusted-keys/trusted_tpm2.c @@ -108,7 +108,7 @@ struct tpm2_key_context { static int tpm2_key_decode(struct trusted_key_payload *payload, struct trusted_key_options *options, - u8 **buf) + u8 **buf, unsigned int *blob_len) { int ret; struct tpm2_key_context ctx; @@ -129,6 +129,7 @@ static int tpm2_key_decode(struct truste return -ENOMEM; *buf = blob; + *blob_len = ctx.priv_len + ctx.pub_len; options->keyhandle = ctx.parent; memcpy(blob, ctx.priv, ctx.priv_len); @@ -384,10 +385,11 @@ static int tpm2_load_cmd(struct tpm_chip int rc; u32 attrs; - rc = tpm2_key_decode(payload, options, &blob); + rc = tpm2_key_decode(payload, options, &blob, &blob_len); if (rc) { /* old form */ blob = payload->blob; + blob_len = payload->blob_len; payload->old_format = 1; } else { /* Bind for cleanup: */ @@ -399,17 +401,17 @@ static int tpm2_load_cmd(struct tpm_chip return -EINVAL; /* must be big enough for at least the two be16 size counts */ - if (payload->blob_len < 4) + if (blob_len < 4) return -EINVAL; private_len = get_unaligned_be16(blob); /* must be big enough for following public_len */ - if (private_len + 2 + 2 > (payload->blob_len)) + if (private_len + 2 + 2 > blob_len) return -E2BIG; public_len = get_unaligned_be16(blob + 2 + private_len); - if (private_len + 2 + public_len + 2 > payload->blob_len) + if (private_len + 2 + public_len + 2 > blob_len) return -E2BIG; pub = blob + 2 + private_len + 2;