From: KAMEZAWA Hiroyuki Fix NULL pointer reference of set_page_owner() in allcation faulure path. Signed-Off-by: Kamezawa Hiroyuki Cc: Alexander Nyberg Cc: Dave Hansen Signed-off-by: Andrew Morton --- mm/page_alloc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) diff -puN mm/page_alloc.c~page-owner-tracking-leak-detector-fix mm/page_alloc.c --- devel/mm/page_alloc.c~page-owner-tracking-leak-detector-fix 2006-01-23 16:42:03.000000000 -0800 +++ devel-akpm/mm/page_alloc.c 2006-01-23 16:42:03.000000000 -0800 @@ -1111,7 +1111,8 @@ nopage: } got_pg: #ifdef CONFIG_PAGE_OWNER - set_page_owner(page, order, gfp_mask); + if (page) + set_page_owner(page, order, gfp_mask); #endif return page; } _