From patchwork Wed Feb 3 12:11:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 375397 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp276179jah; Wed, 3 Feb 2021 04:12:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJwCREa/LbfJopJOgxv4FACohkCURwOslPxOim3Gi+O8tNCzbRK3jOc6+5X6ZexPVm2c02hS X-Received: by 2002:a17:906:c010:: with SMTP id e16mr2801534ejz.91.1612354370619; Wed, 03 Feb 2021 04:12:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612354370; cv=none; d=google.com; s=arc-20160816; b=Kj0VevTim0Ss/N32z0JvbfCx7NF57ovZewwm6MKRQC0JHUXX/hnLnGdRhs62BdrrqX BimKzuDx0UHuDuLOBT4rlBtgmYzQpoVAmjdgQVusubqNrNQPcqw1V7O7DwtEiIfa1U6K VeKNGZelz6rlyMBTrXkczTuiyx9Srw+sLYaZSpEgQPrQX6XitET7a20ePacSb2j3kSFv Cu15s1ChDr6jPoCs5WN5NZ+dW2nVg9tEugafe9hV7zeSQKCjDpYETgFi3F5pvZUPrDf0 ej8GoCGqsqmb2mk/iC1K2ya6vuU8pVoh+5lt+idjPlV6VpeY/TpxUxNnk+wQcSO3cXb6 ameA== 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=fi1fQjyAmUjNmNi6v2gVu3zg2qa8+SGeipDO5I2ClBY=; b=daA65gsM6X7is3QFxwjaVxMvT5y7aheHX0OcyPvrkLoh3HlBYed/ZpBiKLJazcgc0k 8sMdR34OjMBp7H/llNElSiX1LQr8giRHNg+eSyTyn5Mog/+6rsx3RhG05ToYrqGAuVPp 9uoXhvuKgV5+o544slzQntAdL4p/i+r74PoUmlbdcgXuLZc6jW4uRTtlRFNDtTY0RkvX xRyL5L4BfBv4mW5kug6u57pe5Ap3bAydM0cmwCf+Eb434OETaZN7RmgAdatADP1kdowl HCrSOeT/dH2EU9CV/SKFf+nsM+HFVFsiE28RtAUdsMu/aqbr2PASVfRKQ8VB9rKK8sIn FmNA== 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 s13si1072323edj.330.2021.02.03.04.12.50; Wed, 03 Feb 2021 04:12:50 -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 S234478AbhBCMMl (ORCPT + 13 others); Wed, 3 Feb 2021 07:12:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:55486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234394AbhBCMMk (ORCPT ); Wed, 3 Feb 2021 07:12:40 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 85D0F64F74; Wed, 3 Feb 2021 12:11:58 +0000 (UTC) From: Catalin Marinas To: Greg Kroah-Hartman Cc: , Vincenzo Frascino , Will Deacon Subject: [PATCH stable 5.4.x] arm64: Fix kernel address detection of __is_lm_address() Date: Wed, 3 Feb 2021 12:11:56 +0000 Message-Id: <20210203121156.29684-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 51d867cf146c..a77a2ae864e3 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -247,11 +247,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)