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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81584C636D4 for ; Mon, 13 Feb 2023 15:53:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1F9436B0072; Mon, 13 Feb 2023 10:53:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1A9E3280001; Mon, 13 Feb 2023 10:53:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0989F6B0075; Mon, 13 Feb 2023 10:53:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id EFA136B0072 for ; Mon, 13 Feb 2023 10:53:34 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id C57D5803BD for ; Mon, 13 Feb 2023 15:53:34 +0000 (UTC) X-FDA: 80462713548.05.EE701BF Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by imf14.hostedemail.com (Postfix) with ESMTP id E86D410000B for ; Mon, 13 Feb 2023 15:53:31 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b=ESqpZ2Sy; spf=pass (imf14.hostedemail.com: domain of jens.wiklander@linaro.org designates 209.85.218.50 as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dmarc=pass (policy=none) header.from=linaro.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676303612; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ErP9Hj2AwOIstoW4LCGtWgkfr95nFgcjNc3X3BVDtg8=; b=FjD5lrvPM/uDTEwBFdOd6cWPTNmrPn0ZTTyr0rfAh2+y7QAi2cByqUHIQ4lvhFDU++4TdW nlNYZ8yVppTrFe2z2kUofij8aEMOW6CS0qp63QtZBO51XJwJ5Ep01qgUpzDFP0RKsJwpQx mRQQv20nXGoyJ8GyWCguCDll5HEtem8= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b=ESqpZ2Sy; spf=pass (imf14.hostedemail.com: domain of jens.wiklander@linaro.org designates 209.85.218.50 as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dmarc=pass (policy=none) header.from=linaro.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676303612; a=rsa-sha256; cv=none; b=Aea2TfWRz28XzDnalW6WoSylNCtyHyPIGRGa1mJlvqQau98i+4wN+evq2r13YcAVzTA29r +FbZ6zFRzq92ljGMHr/wec7kyKjjRatWqtxHWcCSj2vBZAXUQEfkc9yshxaP7d1bMUAX4z NiEslbNwLytRu0I+RZPtb7CZxRKbF3c= Received: by mail-ej1-f50.google.com with SMTP id hx15so32936106ejc.11 for ; Mon, 13 Feb 2023 07:53:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=ErP9Hj2AwOIstoW4LCGtWgkfr95nFgcjNc3X3BVDtg8=; b=ESqpZ2SyACH+rx3ficRZwkEfOXx4Z38f23MnpKfiCXinSXOrrxE2kfXFiT1vpt2tkz Uv749H46y54fUqa7WB+QgIg3VI0bdJwDOhOXe4+fTk5s7ERzsQ6cPlWaz8td0aL3jSmv YYKmajPm4PLoU3oQcXs0ZKPSXhKVo3wbLPp2+Vb4M0v8jMG7UQFzr8kSo0ORvKGWuw/s RoppqjMF/xS9oQZRzooIZ2qgsTqnz9BXCNTPLlBteZCPP+U1AyvgmiBEQG1Jn7zV42w3 GXv6HxVemoKUcX+Kza8ANrqymV1QfahGPwGFXYoUAGxENsAkJ4w0t9FCqdDrK/LQieZm IXjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ErP9Hj2AwOIstoW4LCGtWgkfr95nFgcjNc3X3BVDtg8=; b=VqNcPWAEEXTrobmfQ2c6WvJzs738yp/t72lRQdDvyAUx9R1fbG5hs7+altGM+01NcA yz/rvhN65rWkQVzeOX3x8ITx+xz2CQxBZ3N6krTIZSjdlJyRyQf0sFk3ZkrugpfZBfxD jOjOeLsQl5yGCIofQ0mKOboqoyAPQhy8wzsOWMaya6Ouij2LELDBAHxNX8URLk9aX1Ym EgMQnHzO++Gb6go0jLYstW8d5ztMwMsEHaH2lQ9Zq4FYeMq4w3H9maYchPJOotCbizNf UgGqY4jpnTm2/MhPT/GNWxoPuNF4kjPpjgDgetgK1LK9I4JyceD4JM8JrmKFk2OdCTEn pdOA== X-Gm-Message-State: AO0yUKWw7bzgaYBBqtODZmrRsm3X5j56txUfXJrxHHvVRPkE/LIL5hWv Z5nWWzy0ClDJBpfYxceFsyFTkg== X-Google-Smtp-Source: AK7set9mYJtrUKijJxj85pueN8QYB7Ucy/bsLKu+MCUB6RMXL6TmXygXX/dqmUMT9vRfQ824aMfw9Q== X-Received: by 2002:a17:906:30d9:b0:882:e975:2fd5 with SMTP id b25-20020a17090630d900b00882e9752fd5mr23762877ejb.26.1676303610644; Mon, 13 Feb 2023 07:53:30 -0800 (PST) Received: from jade (h-46-59-78-111.A175.priv.bahnhof.se. [46.59.78.111]) by smtp.gmail.com with ESMTPSA id 18-20020a170906319200b0084d3bf4498csm7024642ejy.140.2023.02.13.07.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 07:53:30 -0800 (PST) Date: Mon, 13 Feb 2023 16:53:28 +0100 From: Jens Wiklander To: Ira Weiny Cc: Sumit Garg , Andrew Morton , Al Viro , Christoph Hellwig , linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org, linux-mm@kvack.org, "Fabio M. De Francesco" , John Hubbard , Matthew Wilcox , Thomas Gleixner Subject: Re: [PATCH v2 1/4] highmem: Enhance is_kmap_addr() to check kmap_local_page() mappings Message-ID: References: <20230203-get_kernel_pages-v2-0-f1dc4af273f1@intel.com> <20230203-get_kernel_pages-v2-1-f1dc4af273f1@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230203-get_kernel_pages-v2-1-f1dc4af273f1@intel.com> X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: E86D410000B X-Stat-Signature: qorzqodufdd8yfqo1kgaa6f4p443bbud X-Rspam-User: X-HE-Tag: 1676303611-266647 X-HE-Meta: U2FsdGVkX1+nT6Iax3Unv0UuiLLZu30TOd6X1vf4B3hRXUYPpTkMPyK+C11AxndinnBn7lGJLb/pjfxivnCvdAyBA1kd4JTSq86LhD9hvhw457ktu8uMGTEcmAMtM/o39KHgr0iG+VBvx/GTkAdmqxSz/DXmZPlLuCUqhR2xlkz4VR18KsLjcEzMh/Xd5wQh2vCCX0ZN8C5Sr08UN/9KEFfwPecVAbhtUGwA+3J3Av+tbke7bqfXHmcb7ZucaF9M3QAI1oedAmodTRUDTQoXt3EQSJr+qCJBFAZZLv32t5/7O/j5WCJOtzkBPpmXF+eifyUmXCGcq/GqtucFkybwJ3W1XdZWnrrSIIjQSdR3e6JEAW1xOtt5pHjd5I6fS0ATafYU6H0CKvt0ff3ZEhNrC5CaVSe9AnNqC55XL4TO5ENg8+fh44gSIlrUpUuYenr8+hrAu18yIr1ajPhe/olMaEYaIQq+gUfeaoRo2tx/uKuvHZGgaANZNpd7JS0z26I8w2gNasH5XnrVWUKP6Per+LNPY7afuqXmpjK3eE/fbCF2JTI0Csv43Pn0T36H3nh85eVpKxxVMpImrRqimmQjJ5lJw0pObNT42GrdLdBmsDoR5/HOuyqhO39qXx6poDy2wBYDTAa7q2SZwWuoLVQ0xB/jRy3wqMJ32aBJpRAlRYCLforQx9WOEri6GYpkSrxqBDYUzSgyqUwXe6RU97l/fVpykVfZDH8SsxcsyexwI4/3uG5w0zMskuiyJQe/lU524OCpEix7KwL6dBWM55GNUavanGRPLiOgBBSEuJtN5eGJ5PplREoxH5YHNE1qYdByww/uk8/ouf4EZsSjYUrCK2moNKp68w4WI0A3BYxw+TpAKcqmY4bYC/mwSzSIBJ9qbj6T5DpQupq0KF6li7JDuiaBEOLsg9BEhJcVR+krJp9zOuXe17Zt1TRrh9jXbUI7VnuuHByUS8UgGYJ4ay1 Gw1N0T5p MDWuz5GFLKNs9nf2/+cnLjqU5trmu15SvqNmbvSbyYkbXUY6f8pSfr20T1dmUSASjQ337JT/stTMB4eV6JVu9f37johaNb60Zc+aNbKj8u8vk5AT2QdeNZ1jlwRRhn3WDWuu2T2gGBqkskOSn28mQBI6nQSa/oxz5941AjOOV6cQ1eEpBrrcnmLrvNcIMaB17W0uc8h/j+atVXVo6k8ynhG3k7KP07w8Gj2tbWBH5LK18nfJfl/wKL7FQoE/4K9wvTmImqaEWE3AD8GhRkvpfJ6sFXFzgVc3nVvYysHaC5Kl8TvzKuBBAGMhrh82qwWt5+hKnc1CU3Jn9qmtQgMAarldsGQ6fVqmiMs94qHMJvZu62oiVh7GaN6N4kxe/g9MN3KQ80n0riTIO/kFqS3PKfHriqCyCmZ6KW7lX5ofrtoZEIoRUsm3MK6GQ2/70bnnZ3RlWu/m36vTlC7NcG22xMqVOz6WNCaPGeEbDU05YcPhi+6eZ+RxXFcexR83rEEgjLoqW+4wpXzJIIoXtVkE7ntw3AbVGVvB8tPt5m8+TXSnzkvcKL8ULg9AjsN0JbxPPnXrWUEWNIsv7jJDJeEmxMtqRpuGSPH1sOoDLvldry3/8mRcYC/b0ilUr9/cn5Z3/4jVwJk02COK0KyoF56wCM1I266ifbiXRXoewQ9REZLP1UBRBi2tUcmo3NwkahkASDY0v X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, Feb 03, 2023 at 08:06:32PM -0800, Ira Weiny wrote: > is_kmap_addr() is only looking at the kmap() address range which may > cause check_heap_object() to miss checking an overflow on a > kmap_local_page() page. > > Add a check for the kmap_local_page() address range to is_kmap_addr(). > > Cc: Matthew Wilcox > Cc: Al Viro > Cc: "Fabio M. De Francesco" > Cc: Thomas Gleixner > Cc: Christoph Hellwig > Cc: Andrew Morton > Signed-off-by: Ira Weiny > --- > include/linux/highmem-internal.h | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > Added to https://git.linaro.org/people/jens.wiklander/linux-tee.git/log/?h=get_kernel_pages-for-v6.4 Thanks, Jens > diff --git a/include/linux/highmem-internal.h b/include/linux/highmem-internal.h > index e098f38422af..a3028e400a9c 100644 > --- a/include/linux/highmem-internal.h > +++ b/include/linux/highmem-internal.h > @@ -152,7 +152,10 @@ static inline void totalhigh_pages_add(long count) > static inline bool is_kmap_addr(const void *x) > { > unsigned long addr = (unsigned long)x; > - return addr >= PKMAP_ADDR(0) && addr < PKMAP_ADDR(LAST_PKMAP); > + > + return (addr >= PKMAP_ADDR(0) && addr < PKMAP_ADDR(LAST_PKMAP)) || > + (addr >= __fix_to_virt(FIX_KMAP_END) && > + addr < __fix_to_virt(FIX_KMAP_BEGIN)); > } > #else /* CONFIG_HIGHMEM */ > > > -- > 2.39.1