Commit 604c3103 authored by Pali Rohár's avatar Pali Rohár Committed by Herbert Xu

crypto: omap-sham - Check for return value from pm_runtime_get_sync

Function pm_runtime_get_sync could fail and we need to check return
value to prevent kernel crash.
Signed-off-by: default avatarPali Rohár <pali.rohar@gmail.com>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent ca7fc7e9
...@@ -362,7 +362,13 @@ static void omap_sham_copy_ready_hash(struct ahash_request *req) ...@@ -362,7 +362,13 @@ static void omap_sham_copy_ready_hash(struct ahash_request *req)
static int omap_sham_hw_init(struct omap_sham_dev *dd) static int omap_sham_hw_init(struct omap_sham_dev *dd)
{ {
pm_runtime_get_sync(dd->dev); int err;
err = pm_runtime_get_sync(dd->dev);
if (err < 0) {
dev_err(dd->dev, "failed to get sync: %d\n", err);
return err;
}
if (!test_bit(FLAGS_INIT, &dd->flags)) { if (!test_bit(FLAGS_INIT, &dd->flags)) {
set_bit(FLAGS_INIT, &dd->flags); set_bit(FLAGS_INIT, &dd->flags);
...@@ -1947,7 +1953,13 @@ static int omap_sham_probe(struct platform_device *pdev) ...@@ -1947,7 +1953,13 @@ static int omap_sham_probe(struct platform_device *pdev)
pm_runtime_enable(dev); pm_runtime_enable(dev);
pm_runtime_irq_safe(dev); pm_runtime_irq_safe(dev);
pm_runtime_get_sync(dev);
err = pm_runtime_get_sync(dev);
if (err < 0) {
dev_err(dev, "failed to get sync: %d\n", err);
goto err_pm;
}
rev = omap_sham_read(dd, SHA_REG_REV(dd)); rev = omap_sham_read(dd, SHA_REG_REV(dd));
pm_runtime_put_sync(&pdev->dev); pm_runtime_put_sync(&pdev->dev);
...@@ -1977,6 +1989,7 @@ static int omap_sham_probe(struct platform_device *pdev) ...@@ -1977,6 +1989,7 @@ static int omap_sham_probe(struct platform_device *pdev)
for (j = dd->pdata->algs_info[i].registered - 1; j >= 0; j--) for (j = dd->pdata->algs_info[i].registered - 1; j >= 0; j--)
crypto_unregister_ahash( crypto_unregister_ahash(
&dd->pdata->algs_info[i].algs_list[j]); &dd->pdata->algs_info[i].algs_list[j]);
err_pm:
pm_runtime_disable(dev); pm_runtime_disable(dev);
if (dd->dma_lch) if (dd->dma_lch)
dma_release_channel(dd->dma_lch); dma_release_channel(dd->dma_lch);
...@@ -2019,7 +2032,11 @@ static int omap_sham_suspend(struct device *dev) ...@@ -2019,7 +2032,11 @@ static int omap_sham_suspend(struct device *dev)
static int omap_sham_resume(struct device *dev) static int omap_sham_resume(struct device *dev)
{ {
pm_runtime_get_sync(dev); int err = pm_runtime_get_sync(dev);
if (err < 0) {
dev_err(dev, "failed to get sync: %d\n", err);
return err;
}
return 0; return 0;
} }
#endif #endif
......
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