Commit afb31cd2 authored Jul 26, 2018 by Tom Lendacky Committed by Herbert Xu Aug 03, 2018

crypto: ccp - Check for NULL PSP pointer at module unload



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: 2a6170df ("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>

parent 4e34e51f

drivers/crypto/ccp/psp-dev.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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);