[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1458267146-24451-1-git-send-email-acourbot@nvidia.com>
Date: Fri, 18 Mar 2016 11:12:26 +0900
From: Alexandre Courbot <acourbot@...dia.com>
To: Russell King <linux@....linux.org.uk>,
Marek Szyprowski <m.szyprowski@...sung.com>,
Rabin Vincent <rabin@....in>,
Thierry Reding <thierry.reding@...il.com>
CC: linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
gnurou@...il.com, Alexandre Courbot <acourbot@...dia.com>
Subject: [PATCH] ARM: DMA: Fix kzalloc flags in __dma_alloc
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@...dia.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
Powered by blists - more mailing lists