diff options
| author | Gary R Hook <gary.hook@amd.com> | 2019-08-19 22:23:27 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-06 10:20:59 +0200 |
| commit | d204cf4f3169e33111f1b1e51000988108558fe9 (patch) | |
| tree | cc0c29522a03dda38883715b43f516ef54e3d253 | |
| parent | 573710846402a868f56fea58be26b313f28ccf07 (diff) | |
| download | linux-stable-d204cf4f3169e33111f1b1e51000988108558fe9.tar.gz linux-stable-d204cf4f3169e33111f1b1e51000988108558fe9.tar.bz2 linux-stable-d204cf4f3169e33111f1b1e51000988108558fe9.zip | |
crypto: ccp - Ignore unconfigured CCP device on suspend/resume
commit 5871cd93692c8071fb9358daccb715b5081316ac upstream.
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: 720419f01832f ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/crypto/ccp/ccp-dev.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/crypto/ccp/ccp-dev.c b/drivers/crypto/ccp/ccp-dev.c index 18d10694dd2a..b119df4c0043 100644 --- a/drivers/crypto/ccp/ccp-dev.c +++ b/drivers/crypto/ccp/ccp-dev.c @@ -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; @@ -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; |