Skip to content

Commit

Permalink
crypto: ccp - Ignore unconfigured CCP device on suspend/resume
Browse files Browse the repository at this point in the history
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: 720419f ("crypto: ccp - Introduce the AMD Secure Processor device")
Cc: <stable@vger.kernel.org>
Signed-off-by: Gary R Hook <gary.hook@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Gary R Hook authored and Herbert Xu committed Aug 22, 2019
1 parent e2664ec commit 5871cd9
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions drivers/crypto/ccp/ccp-dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,10 @@ int ccp_dev_suspend(struct sp_device *sp, pm_message_t state)
unsigned long flags;
unsigned int i;

/* If there's no device there's nothing to do */
if (!ccp)
return 0;

spin_lock_irqsave(&ccp->cmd_lock, flags);

ccp->suspending = 1;
Expand All @@ -564,6 +568,10 @@ int ccp_dev_resume(struct sp_device *sp)
unsigned long flags;
unsigned int i;

/* If there's no device there's nothing to do */
if (!ccp)
return 0;

spin_lock_irqsave(&ccp->cmd_lock, flags);

ccp->suspending = 0;
Expand Down

0 comments on commit 5871cd9

Please sign in to comment.