From: ira.weiny@intel.com
To: Jens Wiklander <jens.wiklander@linaro.org>,
Sumit Garg <sumit.garg@linaro.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Ira Weiny <ira.weiny@intel.com>,
Matthew Wilcox <willy@infradead.org>,
Al Viro <viro@zeniv.linux.org.uk>,
"Fabio M. De Francesco" <fmdefrancesco@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
Christoph Hellwig <hch@lst.de>,
op-tee@lists.trustedfirmware.org, linux-kernel@vger.kernel.org,
linux-mm@kvack.org
Subject: [PATCH 1/4] highmem: Enhance is_kmap_addr() to check kmap_local_page() mappings
Date: Sat, 1 Oct 2022 17:23:23 -0700 [thread overview]
Message-ID: <20221002002326.946620-2-ira.weiny@intel.com> (raw)
In-Reply-To: <20221002002326.946620-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
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 <willy@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: "Fabio M. De Francesco" <fmdefrancesco@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
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 034b1106d022..5fd5cb58f109 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.37.2
next prev parent reply other threads:[~2022-10-02 0:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-02 0:23 [PATCH 0/4] Remove get_kernel_pages() ira.weiny
2022-10-02 0:23 ` ira.weiny [this message]
2022-10-02 0:23 ` [PATCH 2/4] tee: Remove vmalloc page support ira.weiny
2022-10-03 6:41 ` Jens Wiklander
2022-10-03 6:57 ` Sumit Garg
2022-10-05 3:28 ` Phil Chang (張世勳)
2022-10-06 6:23 ` Sumit Garg
2022-10-06 18:19 ` Ira Weiny
2022-10-06 18:20 ` Linus Torvalds
2022-10-07 8:12 ` Jens Wiklander
2022-12-16 0:41 ` Ira Weiny
2022-12-16 5:09 ` Sumit Garg
2022-12-16 8:45 ` Sumit Garg
2022-12-16 7:06 ` Christoph Hellwig
2022-10-10 7:42 ` Christoph Hellwig
2022-10-10 17:20 ` Linus Torvalds
2022-10-10 17:57 ` Al Viro
2022-10-02 0:23 ` [PATCH 3/4] tee: Remove call to get_kernel_pages() ira.weiny
2022-10-02 0:46 ` Al Viro
2022-10-02 2:30 ` Ira Weiny
2022-10-03 7:17 ` Christoph Hellwig
2022-10-03 15:02 ` Ira Weiny
2022-10-02 0:23 ` [PATCH 4/4] mm: Remove get_kernel_pages() ira.weiny
2022-10-03 20:28 ` John Hubbard
2022-10-03 9:25 ` [PATCH 0/4] " Sumit Garg
2022-10-03 15:22 ` Ira Weiny
2022-10-04 6:32 ` Sumit Garg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221002002326.946620-2-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=akpm@linux-foundation.org \
--cc=fmdefrancesco@gmail.com \
--cc=hch@lst.de \
--cc=jens.wiklander@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=op-tee@lists.trustedfirmware.org \
--cc=sumit.garg@linaro.org \
--cc=tglx@linutronix.de \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).