diff options
| author | Sergey Senozhatsky <sergey.senozhatsky@gmail.com> | 2015-09-08 15:00:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-08 15:35:28 -0700 |
| commit | 44d7175da6ea10e353e69b586bb68bbfef89e403 (patch) | |
| tree | 4d8dc1df9af9c7aacdc2a049382df61c4660b476 /mm | |
| parent | 4e3ca3e033d1eea62fa16c3fdbef4f20427bd0de (diff) | |
| download | linux-44d7175da6ea10e353e69b586bb68bbfef89e403.tar.bz2 | |
mm/dmapool: allow NULL `pool' pointer in dma_pool_destroy()
dma_pool_destroy() does not tolerate a NULL dma_pool pointer argument and
performs a NULL-pointer dereference. This requires additional attention
and effort from developers/reviewers and forces all dma_pool_destroy()
callers to do a NULL check
if (pool)
dma_pool_destroy(pool);
Or, otherwise, be invalid dma_pool_destroy() users.
Tweak dma_pool_destroy() and NULL-check the pointer there.
Proposed by Andrew Morton.
Link: https://lkml.org/lkml/2015/6/8/583
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/dmapool.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/dmapool.c b/mm/dmapool.c index 59d10d16f0a5..4b657099111f 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -271,6 +271,9 @@ void dma_pool_destroy(struct dma_pool *pool) { bool empty = false; + if (unlikely(!pool)) + return; + mutex_lock(&pools_reg_lock); mutex_lock(&pools_lock); list_del(&pool->pools); |