Commit a197b59a authored May 24, 2011 by David Rientjes Committed by Linus Torvalds May 25, 2011

mm: fail GFP_DMA allocations when ZONE_DMA is not configured



The page allocator will improperly return a page from ZONE_NORMAL even
when __GFP_DMA is passed if CONFIG_ZONE_DMA is disabled.  The caller
expects DMA memory, perhaps for ISA devices with 16-bit address registers,
and may get higher memory resulting in undefined behavior.

This patch causes the page allocator to return NULL in such circumstances
with a warning emitted to the kernel log on the first occurrence.

Signed-off-by: David Rientjes <rientjes@google.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent ba93fa81

mm/page_alloc.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -2247,6 +2247,10 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,

		if (should_fail_alloc_page(gfp_mask, order))
		return NULL;
		#ifndef CONFIG_ZONE_DMA
		if (WARN_ON_ONCE(gfp_mask & __GFP_DMA))
		return NULL;
		#endif

		/*
		* Check the zones suitable for the gfp_mask contain at least one