Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

crypto: omap-aes - add error check for pm_runtime_get_sync

Browse source 
The AES driver currently assumes that pm_runtime_get_sync will always
succeed, which may not always be true, so add error handling for the
same.

This scenario was reported in the following bug:
place.  https://bugzilla.kernel.org/show_bug.cgi?id=66441

Reported-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Nishanth Menon 2013-12-03 19:43:13 -06:00 committed by Herbert Xu
parent c0e656b7a6
commit f7b2b5dd6a
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/crypto/omap-aes.c
View file

@ -784,6 +784,7 @@ static int omap_aes_ctr_decrypt(struct ablkcipher_request *req)
static int omap_aes_cra_init(struct crypto_tfm *tfm) static int omap_aes_cra_init(struct crypto_tfm *tfm)
{ {
struct omap_aes_dev *dd = NULL; struct omap_aes_dev *dd = NULL;
int err;
/* Find AES device, currently picks the first device */ /* Find AES device, currently picks the first device */
spin_lock_bh(&list_lock); spin_lock_bh(&list_lock);
@ -792,7 +793,13 @@ static int omap_aes_cra_init(struct crypto_tfm *tfm)
} }
spin_unlock_bh(&list_lock); spin_unlock_bh(&list_lock);
pm_runtime_get_sync(dd->dev); err = pm_runtime_get_sync(dd->dev);
if (err < 0) {
dev_err(dd->dev, "%s: failed to get_sync(%d)\n",
__func__, err);
return err;
}
tfm->crt_ablkcipher.reqsize = sizeof(struct omap_aes_reqctx); tfm->crt_ablkcipher.reqsize = sizeof(struct omap_aes_reqctx);
return 0; return 0;
@ -1182,7 +1189,12 @@ static int omap_aes_probe(struct platform_device *pdev)
dd->phys_base = res.start; dd->phys_base = res.start;
pm_runtime_enable(dev); pm_runtime_enable(dev);
pm_runtime_get_sync(dev); err = pm_runtime_get_sync(dev);
if (err < 0) {
dev_err(dev, "%s: failed to get_sync(%d)\n",
__func__, err);
goto err_res;
}
omap_aes_dma_stop(dd); omap_aes_dma_stop(dd);