592b302d8b
[ Upstream commit 016ff72bd2090903715c0f9422a44afbb966f4ee ]
As reported[1] by Arnd, the arch-specific fadvise64_64 and fallocate
compatibility handlers assume parameters are passed with 32-bit
big-endian ABI. This affects the assignment of odd-even parameter pairs
to the high or low words of a 64-bit syscall parameter.
Fix fadvise64_64 fallocate compat handlers to correctly swap upper/lower
32 bits conditioned on endianness.
A future patch will replace the arch-specific compat fallocate with an
asm-generic implementation. This patch is intended for ease of
back-port.
[1]: https://lore.kernel.org/all/be29926f-226e-48dc-871a-e29a54e80583@www.fastmail.com/
Fixes: 57f48b4b74 ("powerpc/compat_sys: swap hi/lo parts of 64-bit syscall args in LE mode")
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Rohan McLure <rmclure@linux.ibm.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220921065605.1051927-9-rmclure@linux.ibm.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
65 lines
2.1 KiB
C
65 lines
2.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __ASM_POWERPC_SYSCALLS_H
|
|
#define __ASM_POWERPC_SYSCALLS_H
|
|
#ifdef __KERNEL__
|
|
|
|
#include <linux/compiler.h>
|
|
#include <linux/linkage.h>
|
|
#include <linux/types.h>
|
|
#include <linux/compat.h>
|
|
|
|
/*
|
|
* long long munging:
|
|
* The 32 bit ABI passes long longs in an odd even register pair.
|
|
* High and low parts are swapped depending on endian mode,
|
|
* so define a macro (similar to mips linux32) to handle that.
|
|
*/
|
|
#ifdef __LITTLE_ENDIAN__
|
|
#define merge_64(low, high) (((u64)high << 32) | low)
|
|
#else
|
|
#define merge_64(high, low) (((u64)high << 32) | low)
|
|
#endif
|
|
|
|
struct rtas_args;
|
|
|
|
asmlinkage long sys_mmap(unsigned long addr, size_t len,
|
|
unsigned long prot, unsigned long flags,
|
|
unsigned long fd, off_t offset);
|
|
asmlinkage long sys_mmap2(unsigned long addr, size_t len,
|
|
unsigned long prot, unsigned long flags,
|
|
unsigned long fd, unsigned long pgoff);
|
|
asmlinkage long ppc64_personality(unsigned long personality);
|
|
asmlinkage long sys_rtas(struct rtas_args __user *uargs);
|
|
|
|
#ifdef CONFIG_COMPAT
|
|
unsigned long compat_sys_mmap2(unsigned long addr, size_t len,
|
|
unsigned long prot, unsigned long flags,
|
|
unsigned long fd, unsigned long pgoff);
|
|
|
|
compat_ssize_t compat_sys_pread64(unsigned int fd, char __user *ubuf, compat_size_t count,
|
|
u32 reg6, u32 pos1, u32 pos2);
|
|
|
|
compat_ssize_t compat_sys_pwrite64(unsigned int fd, const char __user *ubuf, compat_size_t count,
|
|
u32 reg6, u32 pos1, u32 pos2);
|
|
|
|
compat_ssize_t compat_sys_readahead(int fd, u32 r4, u32 offset1, u32 offset2, u32 count);
|
|
|
|
int compat_sys_truncate64(const char __user *path, u32 reg4,
|
|
unsigned long len1, unsigned long len2);
|
|
|
|
long compat_sys_fallocate(int fd, int mode, u32 offset1, u32 offset2, u32 len1, u32 len2);
|
|
|
|
int compat_sys_ftruncate64(unsigned int fd, u32 reg4, unsigned long len1,
|
|
unsigned long len2);
|
|
|
|
long ppc32_fadvise64(int fd, u32 unused, u32 offset1, u32 offset2,
|
|
size_t len, int advice);
|
|
|
|
long compat_sys_sync_file_range2(int fd, unsigned int flags,
|
|
unsigned int offset1, unsigned int offset2,
|
|
unsigned int nbytes1, unsigned int nbytes2);
|
|
#endif
|
|
|
|
#endif /* __KERNEL__ */
|
|
#endif /* __ASM_POWERPC_SYSCALLS_H */
|