diff options
| author | Singh, Brijesh <brijesh.singh@amd.com> | 2019-04-08 20:42:55 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-22 07:37:36 +0200 |
| commit | 07d677ae4db4fd48f55d75e9ec3b7527b18aacbe (patch) | |
| tree | a97bd58fdb37381f6bf8f9d7a27e7059790e82b0 /drivers/crypto | |
| parent | fe632ee5ade8290119b7ea82350c4695817fb9d6 (diff) | |
| download | linux-stable-07d677ae4db4fd48f55d75e9ec3b7527b18aacbe.tar.gz linux-stable-07d677ae4db4fd48f55d75e9ec3b7527b18aacbe.tar.bz2 linux-stable-07d677ae4db4fd48f55d75e9ec3b7527b18aacbe.zip | |
crypto: ccp - Do not free psp_master when PLATFORM_INIT fails
commit f5a2aeb8b254c764772729a6e48d4e0c914bb56a upstream.
Currently, we free the psp_master if the PLATFORM_INIT fails during the
SEV FW probe. If psp_master is freed then driver does not invoke the PSP
FW. As per SEV FW spec, there are several commands (PLATFORM_RESET,
PLATFORM_STATUS, GET_ID etc) which can be executed in the UNINIT state
We should not free the psp_master when PLATFORM_INIT fails.
Fixes: 200664d5237f ("crypto: ccp: Add SEV support")
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Gary Hook <gary.hook@amd.com>
Cc: stable@vger.kernel.org # 4.19.y
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/ccp/psp-dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c index 72790d88236d..1603dc8d2d75 100644 --- a/drivers/crypto/ccp/psp-dev.c +++ b/drivers/crypto/ccp/psp-dev.c @@ -935,7 +935,7 @@ void psp_pci_init(void) rc = sev_platform_init(&error); if (rc) { dev_err(sp->dev, "SEV: failed to INIT error %#x\n", error); - goto err; + return; } dev_info(sp->dev, "SEV API:%d.%d build:%d\n", psp_master->api_major, |