Commit 5871cd93 authored by Gary R Hook's avatar Gary R Hook Committed by Herbert Xu

crypto: ccp - Ignore unconfigured CCP device on suspend/resume

If a CCP is unconfigured (e.g. there are no available queues) then
there will be no data structures allocated for the device. Thus, we
must check for validity of a pointer before trying to access structure
members.

Fixes: 720419f0 ("crypto: ccp - Introduce the AMD Secure Processor device")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarGary R Hook <gary.hook@amd.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e2664ecb
...@@ -540,6 +540,10 @@ int ccp_dev_suspend(struct sp_device *sp, pm_message_t state) ...@@ -540,6 +540,10 @@ int ccp_dev_suspend(struct sp_device *sp, pm_message_t state)
unsigned long flags; unsigned long flags;
unsigned int i; unsigned int i;
/* If there's no device there's nothing to do */
if (!ccp)
return 0;
spin_lock_irqsave(&ccp->cmd_lock, flags); spin_lock_irqsave(&ccp->cmd_lock, flags);
ccp->suspending = 1; ccp->suspending = 1;
...@@ -564,6 +568,10 @@ int ccp_dev_resume(struct sp_device *sp) ...@@ -564,6 +568,10 @@ int ccp_dev_resume(struct sp_device *sp)
unsigned long flags; unsigned long flags;
unsigned int i; unsigned int i;
/* If there's no device there's nothing to do */
if (!ccp)
return 0;
spin_lock_irqsave(&ccp->cmd_lock, flags); spin_lock_irqsave(&ccp->cmd_lock, flags);
ccp->suspending = 0; ccp->suspending = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment