From: Kim Phillips <kim.phillips@amd.com>
To: <kim.phillips@amd.com>, Tom Lendacky <thomas.lendacky@amd.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
"David S . Miller" <davem@davemloft.net>,
"Rijo Thomas" <Rijo-john.Thomas@amd.com>,
Mario Limonciello <mario.limonciello@amd.com>
Cc: <linux-crypto@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Sashiko <sashiko-bot@kernel.org>, <stable@vger.kernel.org>
Subject: [PATCH v2] crypto: ccp - unwind PSP sub-devices on partial psp_init() failure
Date: Mon, 16 Nov 2026 14:36:22 -0600 [thread overview]
Message-ID: <20261116203622.615371-1-kim.phillips@amd.com> (raw)
psp_init() initializes sub-devices sequentially but returns immediately
on the first failure, leaving earlier sub-devices registered. Its caller
psp_dev_init() then sets sp->psp_data = NULL, so the later
psp_dev_destroy() on unbind bails out early and never unregisters them.
Non-devm resources such as the /dev/sev and /dev/dbc character devices
stay globally visible while their devm-allocated backing structures are
freed by the driver core, giving a use-after-free if userspace opens the
orphaned device.
Add reverse-order unwind labels to psp_init() so each sub-device is torn
down before the error is propagated. Every *_dev_destroy() is already
NULL-guarded on its own psp->*_data pointer, so skipped or unreached
sub-devices are no-ops.
sp_init() continues to ignore the psp_dev_init() return value on
purpose: a PSP failure must not fail the probe, as the CCP can still
initialize successfully.
Fixes: 33960acccfbd ("crypto: ccp - add TEE support for Raven Ridge")
Reported-by: Sashiko <sashiko-bot@kernel.org>
Closes: https://sashiko.dev/#/bug/linux-0de87f0c-0f5a-4dad-8ef1-f49844eb4cce
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Rijo Thomas <Rijo-john.Thomas@amd.com>
Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Kim Phillips <kim.phillips@amd.com>
---
v1: https://lore.kernel.org/linux-crypto/20261021215716.1076732-1-kim.phillips@amd.com/
drivers/crypto/ccp/psp-dev.c | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c
index b14ce51065d5..3d9341c2876d 100644
--- a/drivers/crypto/ccp/psp-dev.c
+++ b/drivers/crypto/ccp/psp-dev.c
@@ -207,19 +207,19 @@ static int psp_init(struct psp_device *psp)
if (!psp_check_tee_support(psp)) {
ret = tee_dev_init(psp);
if (ret)
- return ret;
+ goto e_sev;
}
if (!psp_check_sfs_support(psp)) {
ret = sfs_dev_init(psp);
if (ret)
- return ret;
+ goto e_tee;
}
if (psp->vdata->platform_access) {
ret = platform_access_dev_init(psp);
if (ret)
- return ret;
+ goto e_sfs;
}
/* dbc must come after platform access as it tests the feature */
@@ -227,15 +227,28 @@ static int psp_init(struct psp_device *psp)
psp->capability.dbc_thru_ext) {
ret = dbc_dev_init(psp);
if (ret)
- return ret;
+ goto e_platform_access;
}
/* HSTI uses platform access on some systems. */
ret = psp_init_hsti(psp);
if (ret)
- return ret;
+ goto e_dbc;
return 0;
+
+e_dbc:
+ dbc_dev_destroy(psp);
+e_platform_access:
+ platform_access_dev_destroy(psp);
+e_sfs:
+ sfs_dev_destroy(psp);
+e_tee:
+ tee_dev_destroy(psp);
+e_sev:
+ sev_dev_destroy(psp);
+
+ return ret;
}
int psp_dev_init(struct sp_device *sp)
base-commit: 26ca5f34841f0a86d0883664a1c13be89a01d351
--
2.43.0
reply other threads:[~2026-11-16 20:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20261116203622.615371-1-kim.phillips@amd.com \
--to=kim.phillips@amd.com \
--cc=Rijo-john.Thomas@amd.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mario.limonciello@amd.com \
--cc=sashiko-bot@kernel.org \
--cc=stable@vger.kernel.org \
--cc=thomas.lendacky@amd.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