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.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 8D683C433DB for ; Thu, 4 Feb 2021 15:29:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4D82664F45 for ; Thu, 4 Feb 2021 15:29:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237351AbhBDP30 (ORCPT ); Thu, 4 Feb 2021 10:29:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:53850 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237232AbhBDP3L (ORCPT ); Thu, 4 Feb 2021 10:29:11 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7888C64DE7; Thu, 4 Feb 2021 15:28:22 +0000 (UTC) Date: Thu, 4 Feb 2021 15:28:20 +0000 From: Catalin Marinas To: Greg KH Cc: vincenzo.frascino@arm.com, mark.rutland@arm.com, stable@vger.kernel.org, will@kernel.org Subject: Re: FAILED: patch "[PATCH] arm64: Fix kernel address detection of __is_lm_address()" failed to apply to 5.4-stable tree Message-ID: <20210204152819.GE14155@gaia> References: <1612104058247187@kroah.com> <20210203131501.GB10424@gaia> <20210204151251.GD14155@gaia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Thu, Feb 04, 2021 at 04:27:28PM +0100, Greg Kroah-Hartman wrote: > On Thu, Feb 04, 2021 at 03:12:52PM +0000, Catalin Marinas wrote: > > On Thu, Feb 04, 2021 at 04:08:02PM +0100, Greg Kroah-Hartman wrote: > > > On Wed, Feb 03, 2021 at 01:15:03PM +0000, Catalin Marinas wrote: > > > > On Sun, Jan 31, 2021 at 03:40:58PM +0100, Greg Kroah-Hartman wrote: > > > > > From 519ea6f1c82fcdc9842908155ae379de47818778 Mon Sep 17 00:00:00 2001 > > > > > From: Vincenzo Frascino > > > > > Date: Tue, 26 Jan 2021 13:40:56 +0000 > > > > > Subject: [PATCH] arm64: Fix kernel address detection of __is_lm_address() > > > > > > > > > > Currently, the __is_lm_address() check just masks out the top 12 bits > > > > > of the address, but if they are 0, it still yields a true result. > > > > > This has as a side effect that virt_addr_valid() returns true even for > > > > > invalid virtual addresses (e.g. 0x0). > > > > > > > > > > Fix the detection checking that it's actually a kernel address starting > > > > > at PAGE_OFFSET. > > > > > > > > > > Fixes: 68dd8ef32162 ("arm64: memory: Fix virt_addr_valid() using __is_lm_address()") > > > > > Cc: # 5.4.x > > > > > Cc: Will Deacon > > > > > Suggested-by: Catalin Marinas > > > > > Reviewed-by: Catalin Marinas > > > > > Acked-by: Mark Rutland > > > > > Signed-off-by: Vincenzo Frascino > > > > > Link: https://lore.kernel.org/r/20210126134056.45747-1-vincenzo.frascino@arm.com > > > > > Signed-off-by: Catalin Marinas > > > > > > > > I sent you the 5.4 and 5.10 backports of this patch. There is another > > > > fix in this area which I'll send to Linus tonight. It should apply > > > > cleanly on 5.4 and 5.10. > > > > > > Both now applied. What is the git id of the other fix in Linus's tree? > > > > Thanks. The other commit is 91cb2c8b072e ("arm64: Do not pass tagged > > addresses to __is_lm_address()"). > > Great, grabbed that now too, thanks. Thanks Greg. -- Catalin