mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 08:49:45 +00:00
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>
This commit is contained in:
parent
24085f70a6
commit
ed894bf5a7
1 changed files with 6 additions and 6 deletions
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue