| Message ID | 1384287147-19656-1-git-send-email-mgreer@animalcreek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Nov 12, 2013 at 01:12:27PM -0700, Mark A. Greer wrote: > In omap_sham_probe() and omap_sham_remove(), 'dd->dma_lch' > is released without checking to see if it was successfully > requested or not. This is a bug and was identified and > reported by Dan Carpenter here: > > http://www.spinics.net/lists/devicetree/msg11023.html > > Add code to only release 'dd->dma_lch' when its not NULL > (that is, when it was successfully requested). > > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > CC: Joel Fernandes <joelf@ti.com> > Signed-off-by: Mark A. Greer <mgreer@animalcreek.com> Patch applied.
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index e28104b..c6ad7d6 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c @@ -1970,7 +1970,8 @@ err_algs: crypto_unregister_ahash( &dd->pdata->algs_info[i].algs_list[j]); pm_runtime_disable(dev); - dma_release_channel(dd->dma_lch); + if (dd->dma_lch) + dma_release_channel(dd->dma_lch); data_err: dev_err(dev, "initialization failed.\n"); @@ -1994,7 +1995,9 @@ static int omap_sham_remove(struct platform_device *pdev) &dd->pdata->algs_info[i].algs_list[j]); tasklet_kill(&dd->done_task); pm_runtime_disable(&pdev->dev); - dma_release_channel(dd->dma_lch); + + if (dd->dma_lch) + dma_release_channel(dd->dma_lch); return 0; }
In omap_sham_probe() and omap_sham_remove(), 'dd->dma_lch' is released without checking to see if it was successfully requested or not. This is a bug and was identified and reported by Dan Carpenter here: http://www.spinics.net/lists/devicetree/msg11023.html Add code to only release 'dd->dma_lch' when its not NULL (that is, when it was successfully requested). Reported-by: Dan Carpenter <dan.carpenter@oracle.com> CC: Joel Fernandes <joelf@ti.com> Signed-off-by: Mark A. Greer <mgreer@animalcreek.com> --- drivers/crypto/omap-sham.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)