Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757569Ab3JKJ6S (ORCPT ); Fri, 11 Oct 2013 05:58:18 -0400 Received: from anubis.se.axis.com ([195.60.68.12]:36889 "EHLO anubis.se.axis.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754242Ab3JKJ6R (ORCPT ); Fri, 11 Oct 2013 05:58:17 -0400 Date: Fri, 11 Oct 2013 11:58:13 +0200 From: Jesper Nilsson To: "Kirill A. Shutemov" Cc: Andrew Morton , Peter Zijlstra , Ingo Molnar , "linux-kernel@vger.kernel.org" , "linux-mm@kvack.org" , "linux-arch@vger.kernel.org" , Mikael Starvik , Jesper Nilsson Subject: Re: [PATCH 02/34] cris: fix potential NULL-pointer dereference Message-ID: <20131011095813.GH11028@axis.com> References: <1381428359-14843-1-git-send-email-kirill.shutemov@linux.intel.com> <1381428359-14843-3-git-send-email-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1381428359-14843-3-git-send-email-kirill.shutemov@linux.intel.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1185 Lines: 36 On Thu, Oct 10, 2013 at 08:05:27PM +0200, Kirill A. Shutemov wrote: > Add missing check for memory allocation fail. > > Signed-off-by: Kirill A. Shutemov > Cc: Mikael Starvik Acked-by: Jesper Nilsson > --- > arch/cris/include/asm/pgalloc.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/cris/include/asm/pgalloc.h b/arch/cris/include/asm/pgalloc.h > index 6da975db11..d9504d38c2 100644 > --- a/arch/cris/include/asm/pgalloc.h > +++ b/arch/cris/include/asm/pgalloc.h > @@ -32,6 +32,8 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addres > { > struct page *pte; > pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0); > + if (!pte) > + return NULL; > pgtable_page_ctor(pte); > return pte; > } > -- > 1.8.4.rc3 /^JN - Jesper Nilsson -- Jesper Nilsson -- jesper.nilsson@axis.com -- 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/