From: Will Deacon <will@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: kernel-team@android.com, Will Deacon <will@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Peter Zijlstra <peterz@infradead.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Matt Fleming <matt@codeblueprint.co.uk>,
sparclinux@vger.kernel.org
Subject: [PATCH 1/4] sparc32: mm: Fix argument checking in __srmmu_get_nocache()
Date: Tue, 24 Mar 2020 10:40:02 +0000 [thread overview]
Message-ID: <20200324104005.11279-2-will@kernel.org> (raw)
In-Reply-To: <20200324104005.11279-1-will@kernel.org>
The 'size' argument to __srmmu_get_nocache() is a number of bytes not
a shift value, so fix up the sanity checking to treat it properly.
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Will Deacon <will@kernel.org>
---
arch/sparc/mm/srmmu.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index f56c3c9a9793..a19863cac0c4 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -175,18 +175,18 @@ pte_t *pte_offset_kernel(pmd_t *dir, unsigned long address)
*/
static void *__srmmu_get_nocache(int size, int align)
{
- int offset;
+ int offset, minsz = 1 << SRMMU_NOCACHE_BITMAP_SHIFT;
unsigned long addr;
- if (size < SRMMU_NOCACHE_BITMAP_SHIFT) {
+ if (size < minsz) {
printk(KERN_ERR "Size 0x%x too small for nocache request\n",
size);
- size = SRMMU_NOCACHE_BITMAP_SHIFT;
+ size = minsz;
}
- if (size & (SRMMU_NOCACHE_BITMAP_SHIFT - 1)) {
- printk(KERN_ERR "Size 0x%x unaligned int nocache request\n",
+ if (size & (minsz - 1)) {
+ printk(KERN_ERR "Size 0x%x unaligned in nocache request\n",
size);
- size += SRMMU_NOCACHE_BITMAP_SHIFT - 1;
+ size += minsz - 1;
}
BUG_ON(align > SRMMU_NOCACHE_ALIGN_MAX);
--
2.20.1
next prev parent reply other threads:[~2020-03-24 10:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-24 10:40 [PATCH 0/4] Rework sparc32 page-table layout Will Deacon
2020-03-24 10:40 ` Will Deacon [this message]
2020-03-24 17:41 ` [PATCH 1/4] sparc32: mm: Fix argument checking in __srmmu_get_nocache() Nick Desaulniers
2020-03-24 17:51 ` Will Deacon
2020-03-24 18:04 ` Nick Desaulniers
2020-03-24 10:40 ` [PATCH 2/4] sparc32: mm: Restructure sparc32 MMU page-table layout Will Deacon
2020-03-24 10:40 ` [PATCH 3/4] sparc32: mm: Change pgtable_t type to pte_t * instead of struct page * Will Deacon
2020-03-24 10:40 ` [PATCH 4/4] sparc32: mm: Reduce allocation size for PMD and PTE tables Will Deacon
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=20200324104005.11279-2-will@kernel.org \
--to=will@kernel.org \
--cc=davem@davemloft.net \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matt@codeblueprint.co.uk \
--cc=ndesaulniers@google.com \
--cc=peterz@infradead.org \
--cc=sparclinux@vger.kernel.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).