]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
crypto: ccp - Check for NULL PSP pointer at module unload
authorTom Lendacky <thomas.lendacky@amd.com>
Thu, 26 Jul 2018 14:37:59 +0000 (09:37 -0500)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 3 Aug 2018 10:06:05 +0000 (18:06 +0800)
Should the PSP initialization fail, the PSP data structure will be
freed and the value contained in the sp_device struct set to NULL.
At module unload, psp_dev_destroy() does not check if the pointer
value is NULL and will end up dereferencing a NULL pointer.

Add a pointer check of the psp_data field in the sp_device struct
in psp_dev_destroy() and return immediately if it is NULL.

Cc: <stable@vger.kernel.org> # 4.16.x-
Fixes: 2a6170dfe755 ("crypto: ccp: Add Platform Security Processor (PSP) device support")
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Acked-by: Gary R Hook <gary.hook@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/ccp/psp-dev.c

index 9b596387a09faf0f95d63efc3a7fc473a49150b9..218739b961fe37b8c633443173d3026e19df0a69 100644 (file)
@@ -858,6 +858,9 @@ void psp_dev_destroy(struct sp_device *sp)
 {
        struct psp_device *psp = sp->psp_data;
 
+       if (!psp)
+               return;
+
        if (psp->sev_misc)
                kref_put(&misc_dev->refcount, sev_exit);