leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/syscalls: Simplify do_mmap2()

Browse Source 
When shift is nul, operations remain valid so no test needed.

And 'ret' is unnecessary.

And use IS_ALIGNED() to check alignment, that's more clear.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/373ec500f386374bc5735007df3d3869eac47be1.1624618701.git.christophe.leroy@csgroup.eu
This commit is contained in:
Christophe Leroy
2021-06-25 10:58:33 +00:00
committed by Michael Ellerman
parent e084728393
commit 316389e904
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/powerpc/kernel/syscalls.c
View File

@@ -41,20 +41,13 @@ static inline long do_mmap2(unsigned long addr, size_t len,
unsigned long prot, unsigned long flags, unsigned long prot, unsigned long flags,
unsigned long fd, unsigned long off, int shift) unsigned long fd, unsigned long off, int shift)
{ {
long ret = -EINVAL;
if (!arch_validate_prot(prot, addr)) if (!arch_validate_prot(prot, addr))
goto out; return -EINVAL;
if (shift) { if (!IS_ALIGNED(off, 1 << shift))
if (off & ((1 << shift) - 1)) return -EINVAL;
goto out;
off >>= shift;
}
ret = ksys_mmap_pgoff(addr, len, prot, flags, fd, off); return ksys_mmap_pgoff(addr, len, prot, flags, fd, off >> shift);
out:
return ret;
} }
SYSCALL_DEFINE6(mmap2, unsigned long, addr, size_t, len, SYSCALL_DEFINE6(mmap2, unsigned long, addr, size_t, len,