Skip to contentSkip to conversation

crypto: omap-aes: add error check for pm_runtime_get_sync

PATCH In review Nishanth Menon 2 participants 2 messages Dec 4, 2013 – Dec 5, 2013 Crypto API

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 crypto: omap-aes: add error check for pm_runtime_get_sync

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

---

Note: the bug in OMAP pm_domain layer is addressed here:
https://patchwork.kernel.org/patch/3280531/

Proper fixes required to make this work is part of the series:
http://marc.info/?l=linux-kernel&m=138541594910233&w=2

 drivers/crypto/omap-aes.c |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/crypto/omap-aes.c +14 -2
index a9ccbf1..dde41f1d 100644
@@ -784,6 +784,7 @@ static int omap_aes_ctr_decrypt(struct ablkcipher_request *req)
 static int omap_aes_cra_init(struct crypto_tfm *tfm)
 {
 	struct omap_aes_dev *dd = NULL;
+	int err;
 
 	/* Find AES device, currently picks the first device */
 	spin_lock_bh(&list_lock);
@@ -792,7 +793,13 @@ static int omap_aes_cra_init(struct crypto_tfm *tfm)
 	}
 	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);
 
 	return 0;
@@ -1182,7 +1189,12 @@ static int omap_aes_probe(struct platform_device *pdev)
 	dd->phys_base = res.start;
 
 	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);
 
Signature · 1 line
1.7.9.5
maintainer
#1 lore raw
Quoted 9 lines · Nishanth Menon

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

Patch applied.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt