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=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 9D59EC433E3 for ; Tue, 23 Jun 2020 20:04:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7058921531 for ; Tue, 23 Jun 2020 20:04:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942667; bh=/VBneCgAK76Z0eTB4dxpN4/YMY6yTDWfqnDNixx1vw4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lnOwXwx1HJnqfsgARToqX8COkNqD78ZY0f55lrGx3DQYzIIhT0zruZlMV3bDfjdp/ O1IIMRpUIryS+CLP4EwHEAAeE0XbsWt0/ZRZmr+buVX6tRuOICKNCC+CKdNy8jXI7I O9lfe1gT7rH7fIJbN4kNQKpzoUpaCVUqGnM+yGPY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388208AbgFWUE0 (ORCPT ); Tue, 23 Jun 2020 16:04:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:42926 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387608AbgFWUEZ (ORCPT ); Tue, 23 Jun 2020 16:04:25 -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 EF65F20EDD; Tue, 23 Jun 2020 20:04:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942665; bh=/VBneCgAK76Z0eTB4dxpN4/YMY6yTDWfqnDNixx1vw4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BRS1omUh7A4zWNe5sW6b8dvdROad9jpNi/OXzIDBKX8zDG+AKbvtC206fmAp778EI pVHpX8K8IWz94BOG1cEvzIbk4hOP6AUB3wL/v+GFpd8mVff5hNIeXlUx/soJ4Rz/FX Bo7u8MnGQPI+BsQgRQc9hkBLK1mNg3DS7VlflBVY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "David S. Miller" , "Kirill A. Shutemov" , Will Deacon , Sasha Levin Subject: [PATCH 5.7 087/477] sparc32: mm: Dont try to free page-table pages if ctor() fails Date: Tue, 23 Jun 2020 21:51:24 +0200 Message-Id: <20200623195411.723406838@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Will Deacon [ Upstream commit 454b0289c6b5f2c66164654b80212d15fbef7a03 ] The pages backing page-table allocations for SRMMU are allocated via memblock as part of the "nocache" region initialisation during srmmu_paging_init() and should not be freed even if a later call to pgtable_pte_page_ctor() fails. Remove the broken call to __free_page(). Cc: David S. Miller Cc: Kirill A. Shutemov Fixes: 1ae9ae5f7df7 ("sparc: handle pgtable_page_ctor() fail") Signed-off-by: Will Deacon Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- arch/sparc/mm/srmmu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index a8c2f2615fc6f..ecc9e8786d57f 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c @@ -383,7 +383,6 @@ pgtable_t pte_alloc_one(struct mm_struct *mm) return NULL; page = pfn_to_page(__nocache_pa(pte) >> PAGE_SHIFT); if (!pgtable_pte_page_ctor(page)) { - __free_page(page); return NULL; } return page; -- 2.25.1