From patchwork Wed Feb 3 12:27:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 375398 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp287922jah; Wed, 3 Feb 2021 04:29:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJyVHeAdng6ZaCGLh3+21ErPHVrLBPD6aWJJcByvx5G5Ahu9AARIpfRSXAa1TBHmbOxg9ZKp X-Received: by 2002:a05:6402:3114:: with SMTP id dc20mr580299edb.197.1612355349514; Wed, 03 Feb 2021 04:29:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612355349; cv=none; d=google.com; s=arc-20160816; b=gOWoh1W+ObUhqvtIsuhGH0G2uavbkNaGZfoVpi3BcxbJ0Swb4751cVySr1sWlAWakS F9DcUzfztenlXwofLeVjyI7wYlPJKA/veDJYs20xjfN+yajmfgTSHn/UNrRkiBioQuFr W72MM2WFsXj9ASnpzPtFbSQxzT3RDNDLbR6xTzIJ2t3uwoX3fmgnbfJaeLNiDGuTCnBh cjn7a57UlJDiX1ddK7MuIekhj/tdwNPIHKlBS0rLj/edWsXtnLQIW3Cqg8mvSFQHuft2 8WT4N0KH145nR4uSZRLX1PJZKOdbZtup4C7CfQhVtYloJLHkqvIU2T9aqCgsg+sUTRhH 9nBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=DOGhTCH4C8e4fO0oTcG6qFBUzUa/7eahFrCBC2E7HV8=; b=mzazyv4KKcaHKzNhDAtm5IxSHCNbmZawdZ0ZXvdzeqY9fWlHoDtXWxtiHr8nGzIDGp zkOO4t8eoRchfdtVZlngrQBi9BPl1eeVl0rfPKhrmKR5zZNCdWS4fCNaGp0YGLtCACXr aeyg6bA/jNGqiEf3m8gwGvMkq5wS0U9AJNsFZ5PYKzVn8FaEXU1R/sJYAPtIts/emgpZ 2s7/v7Zdc2P0lTVQYNObzHUke+b1JNV4w/AWA4efrrjfef5keAVavVjm08AS+NrAJLv6 NMrox44KmuUmSsfeyAkX9qEuR+wpls3EGjAmAZ+t8tatH0s6ZeMRqqKl9j398ZkYaCzp ZaEw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p62si1095885edp.242.2021.02.03.04.29.09; Wed, 03 Feb 2021 04:29:09 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234519AbhBCM2M (ORCPT + 13 others); Wed, 3 Feb 2021 07:28:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:40468 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234322AbhBCM2L (ORCPT ); Wed, 3 Feb 2021 07:28:11 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 68DB364F96; Wed, 3 Feb 2021 12:27:29 +0000 (UTC) From: Catalin Marinas To: Greg Kroah-Hartman Cc: , Vincenzo Frascino , Will Deacon Subject: [PATCH stable 5.10.x] arm64: Fix kernel address detection of __is_lm_address() Date: Wed, 3 Feb 2021 12:27:27 +0000 Message-Id: <20210203122727.30288-1-catalin.marinas@arm.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vincenzo Frascino commit 519ea6f1c82fcdc9842908155ae379de47818778 upstream. 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 --- arch/arm64/include/asm/memory.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index cd61239bae8c..8f3020bb75ef 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -238,11 +238,11 @@ static inline const void *__tag_set(const void *addr, u8 tag) /* - * The linear kernel range starts at the bottom of the virtual address - * space. Testing the top bit for the start of the region is a - * sufficient check and avoids having to worry about the tag. + * Check whether an arbitrary address is within the linear map, which + * lives in the [PAGE_OFFSET, PAGE_END) interval at the bottom of the + * kernel's TTBR1 address range. */ -#define __is_lm_address(addr) (!(((u64)addr) & BIT(vabits_actual - 1))) +#define __is_lm_address(addr) (((u64)(addr) ^ PAGE_OFFSET) < (PAGE_END - PAGE_OFFSET)) #define __lm_to_phys(addr) (((addr) & ~PAGE_OFFSET) + PHYS_OFFSET) #define __kimg_to_phys(addr) ((addr) - kimage_voffset)