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 E3A4EC3A5A0 for ; Mon, 20 Apr 2020 12:47:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B702C2072B for ; Mon, 20 Apr 2020 12:47:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386832; bh=zdaV98C4qGP4BiZi+UEicnipIKDAQoW3KWA80HZLGKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vDn2EZovx45MwUJ8K4f8vxAyS3q2LwtR4j94GMWNaZbG8khklYQpwUrgm0HVVHypB YCQeUIqLn9szNY/Ym3eh7zzKfr7WrVPBYMKk0Uw4VWa/mtDmG+AXEr6Mwuafae0x5D W8wyk2evYSErPAWqq+AGn1u7QwzqAFuPeiE9Fo7Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729038AbgDTMrL (ORCPT ); Mon, 20 Apr 2020 08:47:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:42972 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729032AbgDTMrJ (ORCPT ); Mon, 20 Apr 2020 08:47:09 -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 60019206D4; Mon, 20 Apr 2020 12:47:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386828; bh=zdaV98C4qGP4BiZi+UEicnipIKDAQoW3KWA80HZLGKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bn39YE6rtws3JHzDixQ/j9ZqfN7bVH61YISLdNpPmgbpPhs38UvoVTnV70UDSOhB5 hH05Q/HGTbIryAASEaWNRkTir3cqdgfalmrrKvwF+vDOBI3izJSWlVJMYRbbiy4lAv O1HDQZw7VAnTjCA/M9LWbKW91r0B7g4T/14ThdMs= 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.4 41/60] arm64: vdso: dont free unallocated pages Date: Mon, 20 Apr 2020 14:39:19 +0200 Message-Id: <20200420121511.768372248@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420121500.490651540@linuxfoundation.org> References: <20200420121500.490651540@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)