devres: fix possible use after free

devres uses the pointer value as key after it's freed, which is safe but
triggers spurious use-after-free warnings on some static analysis tools.
Rearrange code to avoid such warnings.

Signed-off-by: Maxin B. John <maxin.john@gmail.com>
Reviewed-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/kernel/irq/devres.c b/kernel/irq/devres.c
index 1ef4ffcdfa55b40ef17b0ff4aef0c6533b226308..bd8e788d71e0dd582caa3f97602fd3b86acc21fb 100644 (file)
--- a/kernel/irq/devres.c
+++ b/kernel/irq/devres.c
@@ -87,8 +87,8 @@ void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id)
 {
        struct irq_devres match_data = { irq, dev_id };
 
-       free_irq(irq, dev_id);
        WARN_ON(devres_destroy(dev, devm_irq_release, devm_irq_match,
                               &match_data));
+       free_irq(irq, dev_id);
 }
 EXPORT_SYMBOL(devm_free_irq);

diff --git a/lib/devres.c b/lib/devres.c
index 6efddf53b90c7d53048241bdac70273041df07c1..7c0e953a7486afa4fd5ef9bf98346b4f41e810a9 100644 (file)
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -79,9 +79,9 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
  */
 void devm_iounmap(struct device *dev, void __iomem *addr)
 {
-       iounmap(addr);
        WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
                               (void *)addr));
+       iounmap(addr);
 }
 EXPORT_SYMBOL(devm_iounmap);
 

diff --git a/mm/dmapool.c b/mm/dmapool.c
index 03bf3bb4519a997b8a74c59732cc0feba66af80b..fbb58e3468887e27c34b7500beb628ceedebac69 100644 (file)
--- a/mm/dmapool.c
+++ b/mm/dmapool.c
@@ -500,7 +500,7 @@ void dmam_pool_destroy(struct dma_pool *pool)
 {
        struct device *dev = pool->dev;
 
-       dma_pool_destroy(pool);
        WARN_ON(devres_destroy(dev, dmam_pool_release, dmam_pool_match, pool));
+       dma_pool_destroy(pool);
 }
 EXPORT_SYMBOL(dmam_pool_destroy);