From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ira Weiny To: op-tee@lists.trustedfirmware.org Subject: [PATCH v2 1/4] highmem: Enhance is_kmap_addr() to check kmap_local_page() mappings Date: Fri, 03 Feb 2023 20:06:32 -0800 Message-ID: <20230203-get_kernel_pages-v2-1-f1dc4af273f1@intel.com> In-Reply-To: <20230203-get_kernel_pages-v2-0-f1dc4af273f1@intel.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1489824796265596591==" List-Id: --===============1489824796265596591== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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-interna= l.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 =3D (unsigned long)x; - return addr >=3D PKMAP_ADDR(0) && addr < PKMAP_ADDR(LAST_PKMAP); + + return (addr >=3D PKMAP_ADDR(0) && addr < PKMAP_ADDR(LAST_PKMAP)) || + (addr >=3D __fix_to_virt(FIX_KMAP_END) && + addr < __fix_to_virt(FIX_KMAP_BEGIN)); } #else /* CONFIG_HIGHMEM */ =20 --=20 2.39.1 --===============1489824796265596591==--