Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752403AbaLHIjo (ORCPT ); Mon, 8 Dec 2014 03:39:44 -0500 Received: from hqemgate15.nvidia.com ([216.228.121.64]:6709 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751487AbaLHIjn (ORCPT ); Mon, 8 Dec 2014 03:39:43 -0500 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Mon, 08 Dec 2014 00:37:57 -0800 From: Alexandre Courbot To: Russell King , Marek Szyprowski CC: , , , Alexandre Courbot , Arnd Bergmann , Thierry Reding , Konrad Rzeszutek Wilk Subject: [PATCH] ARM: DMA: Fix kzalloc flags in __iommu_alloc_buffer() Date: Mon, 8 Dec 2014 17:39:27 +0900 Message-ID: <1418027967-12923-1-git-send-email-acourbot@nvidia.com> X-Mailer: git-send-email 2.1.3 X-NVConfidentiality: public MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There doesn't seem to be any valid reason to allocate the pages array with the same flags as the buffer itself. Doing so can eventually lead to the following safeguard in mm/slab.c to be hit: BUG_ON(flags & GFP_SLAB_BUG_MASK); This happens when buffers are allocated with __GFP_DMA32 or __GFP_HIGHMEM. Fix this by allocating the pages array with GFP_KERNEL to follow what is done elsewhere in this file. Using GFP_KERNEL in __iommu_alloc_buffer() is safe because atomic allocations are handled by __iommu_alloc_atomic(). Signed-off-by: Alexandre Courbot Cc: Russell King Cc: Marek Szyprowski Cc: Arnd Bergmann Cc: Thierry Reding Cc: Konrad Rzeszutek Wilk --- 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 e8907117861e..bc495354c802 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1106,7 +1106,7 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size, int i = 0; if (array_size <= PAGE_SIZE) - pages = kzalloc(array_size, gfp); + pages = kzalloc(array_size, GFP_KERNEL); else pages = vzalloc(array_size); if (!pages) -- 2.1.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/