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 B1B92C636D6 for ; Sat, 4 Feb 2023 04:06:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 458396B0073; Fri, 3 Feb 2023 23:06:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3E1136B0074; Fri, 3 Feb 2023 23:06:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 20CB36B0075; Fri, 3 Feb 2023 23:06:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 142006B0073 for ; Fri, 3 Feb 2023 23:06:52 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id AE62680372 for ; Sat, 4 Feb 2023 04:06:51 +0000 (UTC) X-FDA: 80428273422.28.D247AB8 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by imf20.hostedemail.com (Postfix) with ESMTP id 7FEC61C000A for ; Sat, 4 Feb 2023 04:06:48 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=OJ+Zv0IM; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf20.hostedemail.com: domain of ira.weiny@intel.com designates 134.134.136.31 as permitted sender) smtp.mailfrom=ira.weiny@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675483609; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=/rIdkQB0ZSDGFel8kXFZOOIZ6CMWbIREdBjWEiC0Mss=; b=syEk2KUFXLhBBbLxiKPxk/bA40WaHcW12FgXPwCUxcnw+bo51QBDMiu/eq0wmIJyOvgbh0 +dAcOrP+04fA3vB5toyTUw4CUJtsGRt6XOMCfPHppD3yh42lCilNRRgvGq4WpY1d3qyN1R T9HMo4sG4kCl9at6W+drH+nQW13W7uI= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=OJ+Zv0IM; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf20.hostedemail.com: domain of ira.weiny@intel.com designates 134.134.136.31 as permitted sender) smtp.mailfrom=ira.weiny@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675483609; a=rsa-sha256; cv=none; b=yJk/xyo2Puj+S7rtcCa2aa6nmxZN21YTaMuOviFlbf7mYfX3mB5k9XiOZgyXw+jCgQGYaA cVTp+few2ZLLNiaQUihAxM6ajS3g/0D/Ahur2SkvzbpLBKyh2ktifphgIle/RcmfRYgY8o NsL1vtCQeo4O3YW7a98sXclUsLnTqdg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675483609; x=1707019609; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=T75P/a7C6FXtvE4L4LzphFH5nPphv2diXLDPq5xM7Wg=; b=OJ+Zv0IMXTnwmJP/jastNbrZniLf5pDOsFjMJjSOaJqrOiPtYqyV1a+2 vmjeAFcYQYPMMJ/3IKJGsiSpHTVHdhQ2rRqH0D1sGT9LygB0WB9Ws5+aD XA0DZezhuZHsS7d6R/bc9NH3JqZpW5TBX5855lkwhQ0ap+sMaPAxsRVw2 6E1BxvF+UCCJnbesYsEwBbFrf5HWnfoZGKRec6uh4QPj0xfyo+84m8lq1 ND42XEtRA8YxvMWVY7bnclKssEw9nbs+2LHptzx3z5M4EZcJCDj2qKlNR LgRdUq2l3+44ojMac1QTFeil3N39vNEsOxnWd+JUny84MMX4t5ocVK9VC w==; X-IronPort-AV: E=McAfee;i="6500,9779,10610"; a="391309356" X-IronPort-AV: E=Sophos;i="5.97,272,1669104000"; d="scan'208";a="391309356" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Feb 2023 20:06:46 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10610"; a="734573722" X-IronPort-AV: E=Sophos;i="5.97,272,1669104000"; d="scan'208";a="734573722" Received: from iweiny-mobl.amr.corp.intel.com (HELO localhost) ([10.209.125.166]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Feb 2023 20:06:45 -0800 From: Ira Weiny Date: Fri, 03 Feb 2023 20:06:32 -0800 Subject: [PATCH v2 1/4] highmem: Enhance is_kmap_addr() to check kmap_local_page() mappings MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230203-get_kernel_pages-v2-1-f1dc4af273f1@intel.com> References: <20230203-get_kernel_pages-v2-0-f1dc4af273f1@intel.com> In-Reply-To: <20230203-get_kernel_pages-v2-0-f1dc4af273f1@intel.com> To: Sumit Garg , Andrew Morton Cc: Al Viro , Christoph Hellwig , linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org, linux-mm@kvack.org, Jens Wiklander , "Fabio M. De Francesco" , Ira Weiny , John Hubbard , Matthew Wilcox , Thomas Gleixner X-Mailer: b4 0.12-dev-cc11a X-Developer-Signature: v=1; a=ed25519-sha256; t=1675483603; l=1291; i=ira.weiny@intel.com; s=20221211; h=from:subject:message-id; bh=T75P/a7C6FXtvE4L4LzphFH5nPphv2diXLDPq5xM7Wg=; b=0B27CfriIJ0dEfMl8Am+J8B+vWOf/F2xdBWsw+oYNclAM5NadCqEGNnPN+iFuLdkXLXByDbAxosU okv9YtfrCVqkAntku9KClpR74B47/CFM0FjeMzURUnTIqo2RDh/w X-Developer-Key: i=ira.weiny@intel.com; a=ed25519; pk=noldbkG+Wp1qXRrrkfY1QJpDf7QsOEthbOT7vm0PqsE= X-Rspamd-Queue-Id: 7FEC61C000A X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: kf3azmc6heung1b6xknyhkord9x6kj3m X-HE-Tag: 1675483608-532379 X-HE-Meta: U2FsdGVkX1/Ik3xCfgsgW+ldR+ynXZLsNJWaAb7cMB4MDGrMTlpuH/ZFmxgswVBEwpDo6TD2rAdgCG3xJOwpPhwTGj1vG7K+WVJleOXTE6d5I9w5GlVVI0WogshZQ5DP/v2ir20YihN2R9PwXtuh2ckqTGVYBfaikPbcGb0C/7LFB1bcdllUa/qvXA8K2Isgk7wQvCp1g096aJdgxBlCuP8EJ7fDwvyrZlnoYSx990pYYHuBziSgMbYHV8DSa2b1rMhg1bHvZhi8ooOf3tKTg5Q5XiQPA+L+JPLK/O00/VP3ealVY+ADzgtD5Dr2xla7aViVkSDcNNdEu1wvCRHGHBNSZ3NuYPSA0GhkuS8JM3/VZD4ErWnCIsdemteZKxqDn49yl/yv/Y373gbHm1SC0QhcF/Z7QUxgVCrYQlsXq0Lv9Ou8ld7JQliBJNm3jFzKT0rLIhaMX9m4BylneGje1h0NDaMCBBXo2W4T9VDgGo77li9Ww5/I2/HOiRC00W4V9AwQpF9xZsXkFjEJ1UfQpWfHzrCIVomQPEDWwxZaui2B7IO1GuG8aewFSr+YjhnLpd1eZP3/WgiHtNqamT0zEt5kX7Z2clMULL+LPN2Ouq6oM0YaTKYbI3jDBiYS1MvBDHFPgwXfS5vesxqH+I+rlZr3sNEW8lrjwTiFU7oedoHv0bjH7WQrSs4JgwRqul4+ueWMFPOvAHOaHNkzo5SfWei77kKN1H0wjUyndGwgf5hcPs48IUDyn4SVpv9ok7Mp/OV8GaYlay3ZMqxfOtmTQsnZ4iW8TuGU9A0IxrQskna3YdtaYTa5pttIcvpVL0jPDdtFU+5ua7Tki143qEkgl43BoSWfUIBaGF5LVRgt03obxCuUMRdYJAWUiBY+9UL11JDdmz8/3Onx36FGEKNi5uiHzv3dwCISDR83NqfDCdPGF+fxCS92n3eCJmAnUsOlthyPNEvVeV/Nos2UqQe 1IOPZRIb FaffQSDR2o0yY8mKZr0PLHLJQU2NBttA+NItrI2W6Sb8DQmLVJfAjlelOtGkwVaYEqXpzq0fNDXhpb1qnCTg5u6xeoLErnjpLihk/9PxVcPsWG/HSHvKvMRMCv3N+DqvcdbIEbOJTaC3p37y3xyARs8VPE/5aFHY3xYnLpsgPH8JbxCKZpgxBdxe38lqX+0EflEFkCnok04fPGOaZ9QGGQSiLujcZT/V59UrrYvJaQXzyyIvG68K6dbnAyyEYyOMsC9Gvdd6nSXSQKnuPZ1RnAtWBvCsIsKa4eD5wCjbUs3pRLA6/mAWggIos/hWEVkHytR2bZxN1jIqmE2m3hIW7T7y78ZlI1Nfz4qNXCicXOUbNCYHyphfGrcPO9czc4ea0wEMEtHjh8s/zjrT2Cc93xRInYe2nljhEhC5tZk+SohxIA0zAMTWRG2C/PA== 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: 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(-) 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