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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 10A8DC3815B for ; Mon, 20 Apr 2020 12:44:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E471B2075A for ; Mon, 20 Apr 2020 12:44:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386669; bh=zdaV98C4qGP4BiZi+UEicnipIKDAQoW3KWA80HZLGKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=awbTki6XEZN/5tTB7L1DZiMu3HwPavis3k1LuuYU4zzmrqZjN+jN+P3+QHGVlatLn hY870ivXLnh0EwoPhEnOn4LBFqelcFOhGDiCj5e4klzgAyR9MqMltOpRdqO5WbIKno sLEsptUBMoXrKmBdnx+OXLwmnbq0eVhlcJTDnXOA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728576AbgDTMo2 (ORCPT ); Mon, 20 Apr 2020 08:44:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:38418 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728571AbgDTMo1 (ORCPT ); Mon, 20 Apr 2020 08:44:27 -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 D59F0206DD; Mon, 20 Apr 2020 12:44:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386667; bh=zdaV98C4qGP4BiZi+UEicnipIKDAQoW3KWA80HZLGKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a2iE0JHVyzG9NJZidmUie0a9X0bYsBcpPzblsMVVHsB4XdjZ1NaHa8T08Hk2xGL5q QSqRbY8DjqAljV4tJPOoBvJavToXek9VRMHPQLsSEiUducfiSLPexAzTb1ykt5hOcx 3OPx9T3klwA2I+UoRhjdk5FYsqSGI5hM7FjmrjGg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vincenzo Frascino , Will Deacon , Mark Rutland , Catalin Marinas Subject: [PATCH 5.6 48/71] arm64: vdso: dont free unallocated pages Date: Mon, 20 Apr 2020 14:39:02 +0200 Message-Id: <20200420121518.940384546@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420121508.491252919@linuxfoundation.org> References: <20200420121508.491252919@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: Mark Rutland commit 9cc3d0c6915aee5140f8335d41bbc3ff1b79aa4e upstream. The aarch32_vdso_pages[] array never has entries allocated in the C_VVAR or C_VDSO slots, and as the array is zero initialized these contain NULL. However in __aarch32_alloc_vdso_pages() when aarch32_alloc_kuser_vdso_page() fails we attempt to free the page whose struct page is at NULL, which is obviously nonsensical. This patch removes the erroneous page freeing. Fixes: 7c1deeeb0130 ("arm64: compat: VDSO setup for compat layer") Cc: # 5.3.x- Cc: Vincenzo Frascino Acked-by: Will Deacon Signed-off-by: Mark Rutland Signed-off-by: Catalin Marinas Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kernel/vdso.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -260,18 +260,7 @@ static int __aarch32_alloc_vdso_pages(vo if (ret) return ret; - ret = aarch32_alloc_kuser_vdso_page(); - if (ret) { - unsigned long c_vvar = - (unsigned long)page_to_virt(aarch32_vdso_pages[C_VVAR]); - unsigned long c_vdso = - (unsigned long)page_to_virt(aarch32_vdso_pages[C_VDSO]); - - free_page(c_vvar); - free_page(c_vdso); - } - - return ret; + return aarch32_alloc_kuser_vdso_page(); } #else static int __aarch32_alloc_vdso_pages(void)