From: Alexey Kardashevskiy <aik@amd.com>
To: <x86@kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <linux-crypto@vger.kernel.org>,
"Ashish Kalra" <ashish.kalra@amd.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
"Aneesh Kumar K.V" <aneesh.kumar@kernel.org>,
Jason Gunthorpe <jgg@ziepe.ca>, "Lukas Wunner" <lukas@wunner.de>,
Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
Kuppuswamy Sathyanarayanan
<sathyanarayanan.kuppuswamy@linux.intel.com>,
Jonathan Cameron <jonathan.cameron@oss.qualcomm.com>,
<linux-coco@lists.linux.dev>,
"Santosh Shukla" <santosh.shukla@amd.com>,
"Pratik R . Sampat" <prsampat@amd.com>,
Scott Soule Cheloha <scott.cheloha@amd.com>,
Ackerley Tng <ackerleytng@google.com>,
Sean Christopherson <seanjc@google.com>,
Fuad Tabba <tabba@google.com>,
Xu Yilun <yilun.xu@linux.intel.com>,
Alexey Kardashevskiy <aik@amd.com>, <aik@ozlabs.ru>
Subject: [PATCH kernel 2/4] crypto/ccp/tsm: Fix potential size mismatch in releasing SPDM buffers
Date: Thu, 19 Nov 2026 23:57:31 +1100 [thread overview]
Message-ID: <20261119125733.1860288-3-aik@amd.com> (raw)
In-Reply-To: <20261119125733.1860288-1-aik@amd.com>
At the moment the CCP driver allocates buffers of the maximum supported
sizes which are reported by the PSP, and potentially expands some.
The spdm_ctrl_free() helper though releases all buffers with (incorrectly)
calculated sizes.
Drop the calculation for request/response and use the maximum size
for free.
Use the actual size (potentially expanded) of scratch and output buffers.
While at this, replace the incorrect check for dev_ctx with the correct
check of the output buffer.
This did not bite so far as the maximum for request/response is 4K,
alloc and free are page aligned and the expansion is not implemented yet
in the PSP.
Fixes: 4be423572da1 ("crypto/ccp: Implement SEV-TIO PCIe IDE (phase1)")
Signed-off-by: Alexey Kardashevskiy <aik@amd.com>
---
drivers/crypto/ccp/sev-dev-tio.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/crypto/ccp/sev-dev-tio.c b/drivers/crypto/ccp/sev-dev-tio.c
index c84e23982b434..37ace91a7d4d8 100644
--- a/drivers/crypto/ccp/sev-dev-tio.c
+++ b/drivers/crypto/ccp/sev-dev-tio.c
@@ -639,25 +639,23 @@ static void spdm_ctrl_init(struct spdm_ctrl *ctrl, struct tsm_dsm_tio *dev_data)
static void spdm_ctrl_free(struct tsm_dsm_tio *dev_data)
{
struct sev_tio_status *tio_status = to_tio_status(dev_data);
- size_t len = tio_status->spdm_req_size_max -
- (sla_dobj_id_to_size(SPDM_DOBJ_ID_RESP) +
- sizeof(struct sla_buffer_hdr));
struct tsm_spdm *spdm = &dev_data->spdm;
sla_buffer_unmap(dev_data->resp, dev_data->respbuf);
sla_buffer_unmap(dev_data->req, dev_data->reqbuf);
spdm->rsp = NULL;
spdm->req = NULL;
- sla_free(dev_data->req, len, true);
- sla_free(dev_data->resp, len, false);
- sla_free(dev_data->scratch, tio_status->spdm_scratch_size_max, true);
+ sla_free(dev_data->req, tio_status->spdm_req_size_max, true);
+ sla_free(dev_data->resp, tio_status->spdm_req_size_max, false);
+ sla_free(dev_data->scratch, dev_data->scratch_len, true);
dev_data->req.sla = 0;
dev_data->resp.sla = 0;
dev_data->scratch.sla = 0;
dev_data->respbuf = NULL;
dev_data->reqbuf = NULL;
- sla_free(dev_data->output, tio_status->spdm_out_size_max, true);
+ sla_free(dev_data->output, dev_data->output_len, true);
+ dev_data->output.sla = 0;
}
static int spdm_ctrl_alloc(struct tsm_dsm_tio *dev_data)
@@ -674,7 +672,7 @@ static int spdm_ctrl_alloc(struct tsm_dsm_tio *dev_data)
dev_data->output = sla_alloc(dev_data->output_len, true);
if (IS_SLA_NULL(dev_data->req) || IS_SLA_NULL(dev_data->resp) ||
- IS_SLA_NULL(dev_data->scratch) || IS_SLA_NULL(dev_data->dev_ctx)) {
+ IS_SLA_NULL(dev_data->scratch) || IS_SLA_NULL(dev_data->output)) {
ret = -ENOMEM;
goto free_spdm_exit;
}
--
2.55.0
next prev parent reply other threads:[~2026-11-19 12:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 12:57 [PATCH kernel 0/4] PCI/TSM queue Alexey Kardashevskiy
2026-11-19 12:57 ` [PATCH kernel 1/4] MAINTAINERS: Update TSM file coverage and repository Alexey Kardashevskiy
2026-11-19 12:57 ` Alexey Kardashevskiy [this message]
2026-11-19 12:57 ` [PATCH kernel 3/4] crypto/ccp/tsm: Remove unused header Alexey Kardashevskiy
2026-11-19 12:57 ` [PATCH kernel 4/4] crypto/ccp/tsm: Use TSM API for DOE Alexey Kardashevskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261119125733.1860288-3-aik@amd.com \
--to=aik@amd.com \
--cc=ackerleytng@google.com \
--cc=aik@ozlabs.ru \
--cc=aneesh.kumar@kernel.org \
--cc=ashish.kalra@amd.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=jgg@ziepe.ca \
--cc=jonathan.cameron@oss.qualcomm.com \
--cc=linux-coco@lists.linux.dev \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=prsampat@amd.com \
--cc=santosh.shukla@amd.com \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
--cc=scott.cheloha@amd.com \
--cc=seanjc@google.com \
--cc=tabba@google.com \
--cc=thomas.lendacky@amd.com \
--cc=x86@kernel.org \
--cc=yilun.xu@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox