From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3769FC2D0FA for ; Wed, 13 May 2020 11:20:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1791823126 for ; Wed, 13 May 2020 11:20:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589368817; bh=VsTxQWxtAzHsTjQO+yKb7lilsW41+D/S6/UQRjTZZOo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=KP1kO8o9yRQJmvR8uKzVt1tXtT/aXHz015GiKDIJo0QtknAmwEDh777LG1o3fjbBC 9ojuC16jzk8A7NEIlIaVpye6ACvWbFH8tihyBayiNvR9nKRO4dF1XN8ZsByPB3rw9e RhuH7518bwv+upl+NUYx5YomYN66yN0suhP8KI9c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732727AbgEMLUQ (ORCPT ); Wed, 13 May 2020 07:20:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:51128 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732645AbgEMLUQ (ORCPT ); Wed, 13 May 2020 07:20:16 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 34AF520753; Wed, 13 May 2020 11:20:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589368815; bh=VsTxQWxtAzHsTjQO+yKb7lilsW41+D/S6/UQRjTZZOo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=KTBPYDosG9uW6ltz9IqO6pV14qWXE3TnFMfSRetF72SoKGWFH0jhoQAELiWcvW93b 4rXcSff4TdFdyYB7wiTQ386m+0hFEHk8L/fPEsbEh5ku5y3KzYkPXolcsP5WsOb7qX xJ9NIGjoiSnk1QW/iSeVFUS0O4EtTZyQ4orN4nSA= Date: Wed, 13 May 2020 13:20:13 +0200 From: Greg Kroah-Hartman To: Naresh Kamboju Cc: Sasha Levin , Mark Rutland , catalin.marinas@arm.com, kyrylo.tkachov@arm.com, linux- stable , Will Deacon Subject: Re: FAILED: patch "[PATCH] arm64: hugetlb: avoid potential NULL dereference" failed to apply to 4.14-stable tree Message-ID: <20200513112013.GA874540@kroah.com> References: <15892828013114@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Wed, May 13, 2020 at 04:23:11PM +0530, Naresh Kamboju wrote: > On Tue, 12 May 2020 at 16:56, wrote: > > > > > > The patch below does not apply to the 4.14-stable tree. > > If someone wants it applied there, or to any other stable or longterm > > tree, then please email the backport, including the original git commit > > id to . > > > > thanks, > > > > greg k-h > > > > ------------------ original commit in Linus's tree ------------------ > > > > From 027d0c7101f50cf03aeea9eebf484afd4920c8d3 Mon Sep 17 00:00:00 2001 > > From: Mark Rutland > > Date: Tue, 5 May 2020 13:59:30 +0100 > > Subject: [PATCH] arm64: hugetlb: avoid potential NULL dereference > > MIME-Version: 1.0 > > Content-Type: text/plain; charset=UTF-8 > > Content-Transfer-Encoding: 8bit > > > > The static analyzer in GCC 10 spotted that in huge_pte_alloc() we may > > pass a NULL pmdp into pte_alloc_map() when pmd_alloc() returns NULL: > > > > | CC arch/arm64/mm/pageattr.o > > | CC arch/arm64/mm/hugetlbpage.o > > | from arch/arm64/mm/hugetlbpage.c:10: > > | arch/arm64/mm/hugetlbpage.c: In function ‘huge_pte_alloc’: > > | ./arch/arm64/include/asm/pgtable-types.h:28:24: warning: dereference of NULL ‘pmdp’ [CWE-690] [-Wanalyzer-null-dereference] > > | ./arch/arm64/include/asm/pgtable.h:436:26: note: in expansion of macro ‘pmd_val’ > > | arch/arm64/mm/hugetlbpage.c:242:10: note: in expansion of macro ‘pte_alloc_map’ > > | |arch/arm64/mm/hugetlbpage.c:232:10: > > | |./arch/arm64/include/asm/pgtable-types.h:28:24: > > | ./arch/arm64/include/asm/pgtable.h:436:26: note: in expansion of macro ‘pmd_val’ > > | arch/arm64/mm/hugetlbpage.c:242:10: note: in expansion of macro ‘pte_alloc_map’ > > > > This can only occur when the kernel cannot allocate a page, and so is > > unlikely to happen in practice before other systems start failing. > > > > We can avoid this by bailing out if pmd_alloc() fails, as we do earlier > > in the function if pud_alloc() fails. > > > > Fixes: 66b3923a1a0f ("arm64: hugetlb: add support for PTE contiguous bit") > > Signed-off-by: Mark Rutland > > Reported-by: Kyrill Tkachov > > Cc: # 4.5.x- > > Cc: Will Deacon > > Signed-off-by: Catalin Marinas > > > > diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c > > index bbeb6a5a6ba6..0be3355e3499 100644 > > --- a/arch/arm64/mm/hugetlbpage.c > > +++ b/arch/arm64/mm/hugetlbpage.c > > @@ -230,6 +230,8 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, > > ptep = (pte_t *)pudp; > > } else if (sz == (CONT_PTE_SIZE)) { > > pmdp = pmd_alloc(mm, pudp, addr); > > + if (!pmdp) > > + return NULL; > > > > WARN_ON(addr & (sz - 1)); > > /* > > As per the subject this patch failed to apply on 4.14 > FYI, > on stable-rc 4.14 branch arm64 architecture build failed. > > # make -sk KBUILD_BUILD_USER=TuxBuild -C/linux -j16 ARCH=arm64 > CROSS_COMPILE=aarch64-linux-gnu- HOSTCC=gcc CC="sccache > aarch64-linux-gnu-gcc" O=build Image > 70 # > 71 ../arch/arm64/mm/hugetlbpage.c: In function ‘huge_pte_alloc’: > 72 ../arch/arm64/mm/hugetlbpage.c:223:8: error: ‘pmdp’ undeclared > (first use in this function); did you mean ‘pmd’? > 73 223 | if (!pmdp) > 74 | ^~~~ > 75 | pmd > 76 ../arch/arm64/mm/hugetlbpage.c:223:8: note: each undeclared > identifier is reported only once for each function it appears in > 77 make[2]: *** [../scripts/Makefile.build:326: > arch/arm64/mm/hugetlbpage.o] Error 1 > > ref: > https://gitlab.com/Linaro/lkft/kernel-runs/-/jobs/550145375 Now dropped from 4.9 and 4.14 trees, the backport was incorrect... greg k-h