From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752724AbdKVMgs (ORCPT ); Wed, 22 Nov 2017 07:36:48 -0500 Received: from mx2.suse.de ([195.135.220.15]:60648 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752370AbdKVMgq (ORCPT ); Wed, 22 Nov 2017 07:36:46 -0500 Subject: Re: [PATCH] mm/hugetlb: Fix NULL-pointer dereference on 5-level paging machine To: "Kirill A. Shutemov" , Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, Michal Hocko , stable@vger.kernel.org References: <20171122121921.64822-1-kirill.shutemov@linux.intel.com> From: Vlastimil Babka Message-ID: <88a7a176-6070-2bf1-4579-d5fccdfc7f37@suse.cz> Date: Wed, 22 Nov 2017 13:36:43 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <20171122121921.64822-1-kirill.shutemov@linux.intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/22/2017 01:19 PM, Kirill A. Shutemov wrote: > I've made mistake during converting hugetlb code to 5-level paging: > in huge_pte_alloc() we have to use p4d_alloc(), not p4d_offset(). > Otherwise it leads to crash -- NULL-pointer dereference in pud_alloc() > if p4d table is not yet allocated. > > It only can happen in 5-level paging mode. In 4-level paging mode > p4d_offset() always returns pgd, so we are fine. > > Signed-off-by: Kirill A. Shutemov > Fixes: c2febafc6773 ("mm: convert generic code to 5-level paging") > Cc: # v4.11+ Acked-by: Vlastimil Babka > --- > mm/hugetlb.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 2d2ff5e8bf2b..94a4c0b63580 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -4617,7 +4617,9 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, > pte_t *pte = NULL; > > pgd = pgd_offset(mm, addr); > - p4d = p4d_offset(pgd, addr); > + p4d = p4d_alloc(mm, pgd, addr); > + if (!p4d) > + return NULL; > pud = pud_alloc(mm, p4d, addr); > if (pud) { > if (sz == PUD_SIZE) { > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Subject: Re: [PATCH] mm/hugetlb: Fix NULL-pointer dereference on 5-level paging machine To: "Kirill A. Shutemov" , Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, Michal Hocko , stable@vger.kernel.org References: <20171122121921.64822-1-kirill.shutemov@linux.intel.com> From: Vlastimil Babka Message-ID: <88a7a176-6070-2bf1-4579-d5fccdfc7f37@suse.cz> Date: Wed, 22 Nov 2017 13:36:43 +0100 MIME-Version: 1.0 In-Reply-To: <20171122121921.64822-1-kirill.shutemov@linux.intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: On 11/22/2017 01:19 PM, Kirill A. Shutemov wrote: > I've made mistake during converting hugetlb code to 5-level paging: > in huge_pte_alloc() we have to use p4d_alloc(), not p4d_offset(). > Otherwise it leads to crash -- NULL-pointer dereference in pud_alloc() > if p4d table is not yet allocated. > > It only can happen in 5-level paging mode. In 4-level paging mode > p4d_offset() always returns pgd, so we are fine. > > Signed-off-by: Kirill A. Shutemov > Fixes: c2febafc6773 ("mm: convert generic code to 5-level paging") > Cc: # v4.11+ Acked-by: Vlastimil Babka > --- > mm/hugetlb.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 2d2ff5e8bf2b..94a4c0b63580 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -4617,7 +4617,9 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, > pte_t *pte = NULL; > > pgd = pgd_offset(mm, addr); > - p4d = p4d_offset(pgd, addr); > + p4d = p4d_alloc(mm, pgd, addr); > + if (!p4d) > + return NULL; > pud = pud_alloc(mm, p4d, addr); > if (pud) { > if (sz == PUD_SIZE) { > -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org