diff options
| author | Will Deacon <will@kernel.org> | 2020-04-14 22:40:08 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-13 15:32:00 -0700 |
| commit | ed894bf5a76357eb92045c79d6ae2f29814c6183 (patch) | |
| tree | ec6be112260522d754fcb39d4f59ed1c10feddef /arch/sparc | |
| parent | 24085f70a6e1b0cb647ec92623284641d8270637 (diff) | |
| download | linux-stable-ed894bf5a76357eb92045c79d6ae2f29814c6183.tar.gz linux-stable-ed894bf5a76357eb92045c79d6ae2f29814c6183.tar.bz2 linux-stable-ed894bf5a76357eb92045c79d6ae2f29814c6183.zip | |
sparc32: mm: Fix argument checking in __srmmu_get_nocache()
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/mm/srmmu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index b7c94de70cca..cb9ded8a68b7 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); |