[PATCH] ARM: DMA: Fix kzalloc flags in __dma_alloc

From	Alexandre Courbot <acourbot@nvidia.com>
Newsgroups	linux.kernel
Subject	[PATCH] ARM: DMA: Fix kzalloc flags in __dma_alloc
Date	2016-03-18 03:20 +0100
Message-ID	<rdSb7-7Bc-1@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Commit 19e6e5e5392b ("ARM: 8547/1: dma-mapping: store buffer
information") allocates a structure meant for internal buffer management
with the GFP flags of the buffer itself. This can trigger the following
safeguard in the slab/slub allocator:

	if (unlikely(flags & GFP_SLAB_BUG_MASK)) {
		pr_emerg("gfp: %u\n", flags & GFP_SLAB_BUG_MASK);
		BUG();
	}

Fix this by allocating the structure with GFP_KERNEL, as it is meant to
be used by the kernel and not for DMA.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
---
 arch/arm/mm/dma-mapping.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index deac58d5f1f7..6a19ebe6a461 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -762,7 +762,7 @@ static void *__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
 	if (!mask)
 		return NULL;
 
-	buf = kzalloc(sizeof(*buf), gfp);
+	buf = kzalloc(sizeof(*buf), GFP_KERNEL);
 	if (!buf)
 		return NULL;
 
-- 
2.7.3

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] ARM: DMA: Fix kzalloc flags in __dma_alloc Alexandre Courbot <acourbot@nvidia.com> - 2016-03-18 03:20 +0100
  Re: [PATCH] ARM: DMA: Fix kzalloc flags in __dma_alloc Rabin Vincent <rabin@rab.in> - 2016-03-18 09:10 +0100
    Re: [PATCH] ARM: DMA: Fix kzalloc flags in __dma_alloc Alexandre Courbot <acourbot@nvidia.com> - 2016-03-18 10:40 +0100

csiph-web