mirror of
https://github.com/torvalds/linux.git
synced 2024-11-19 10:31:48 +00:00
fb37397594
While converting compat system call handlers to work on 32-bit architectures, I found a number of types used in those handlers that are identical between all architectures. Let's move all the identical ones into asm-generic/compat.h to avoid having to add even more identical definitions of those types. For unknown reasons, mips defines __compat_gid32_t, __compat_uid32_t and compat_caddr_t as signed, while all others have them unsigned. This seems to be a mistake, but I'm leaving it alone here. The other types all differ by size or alignment on at least on architecture. compat_aio_context_t is currently defined in linux/compat.h but also needed for compat_sys_io_getevents(), so let's move it into the same place. While we still have not decided whether the 32-bit time handling will always use the compat syscalls, or in which form, I think this is a useful cleanup that we can merge regardless. Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
212 lines
4.6 KiB
C
212 lines
4.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _ASM_COMPAT_H
|
|
#define _ASM_COMPAT_H
|
|
/*
|
|
* Architecture specific compatibility types
|
|
*/
|
|
#include <linux/thread_info.h>
|
|
#include <linux/types.h>
|
|
#include <asm/page.h>
|
|
#include <asm/ptrace.h>
|
|
|
|
#include <asm-generic/compat.h>
|
|
|
|
#define COMPAT_USER_HZ 100
|
|
#define COMPAT_UTS_MACHINE "mips\0\0\0"
|
|
|
|
typedef s32 __compat_uid_t;
|
|
typedef s32 __compat_gid_t;
|
|
typedef __compat_uid_t __compat_uid32_t;
|
|
typedef __compat_gid_t __compat_gid32_t;
|
|
typedef u32 compat_mode_t;
|
|
typedef u32 compat_dev_t;
|
|
typedef u32 compat_nlink_t;
|
|
typedef s32 compat_ipc_pid_t;
|
|
typedef s32 compat_caddr_t;
|
|
typedef struct {
|
|
s32 val[2];
|
|
} compat_fsid_t;
|
|
typedef s64 compat_s64;
|
|
typedef u64 compat_u64;
|
|
|
|
struct compat_stat {
|
|
compat_dev_t st_dev;
|
|
s32 st_pad1[3];
|
|
compat_ino_t st_ino;
|
|
compat_mode_t st_mode;
|
|
compat_nlink_t st_nlink;
|
|
__compat_uid_t st_uid;
|
|
__compat_gid_t st_gid;
|
|
compat_dev_t st_rdev;
|
|
s32 st_pad2[2];
|
|
compat_off_t st_size;
|
|
s32 st_pad3;
|
|
old_time32_t st_atime;
|
|
s32 st_atime_nsec;
|
|
old_time32_t st_mtime;
|
|
s32 st_mtime_nsec;
|
|
old_time32_t st_ctime;
|
|
s32 st_ctime_nsec;
|
|
s32 st_blksize;
|
|
s32 st_blocks;
|
|
s32 st_pad4[14];
|
|
};
|
|
|
|
struct compat_flock {
|
|
short l_type;
|
|
short l_whence;
|
|
compat_off_t l_start;
|
|
compat_off_t l_len;
|
|
s32 l_sysid;
|
|
compat_pid_t l_pid;
|
|
s32 pad[4];
|
|
};
|
|
|
|
#define F_GETLK64 33
|
|
#define F_SETLK64 34
|
|
#define F_SETLKW64 35
|
|
|
|
struct compat_flock64 {
|
|
short l_type;
|
|
short l_whence;
|
|
compat_loff_t l_start;
|
|
compat_loff_t l_len;
|
|
compat_pid_t l_pid;
|
|
};
|
|
|
|
struct compat_statfs {
|
|
int f_type;
|
|
int f_bsize;
|
|
int f_frsize;
|
|
int f_blocks;
|
|
int f_bfree;
|
|
int f_files;
|
|
int f_ffree;
|
|
int f_bavail;
|
|
compat_fsid_t f_fsid;
|
|
int f_namelen;
|
|
int f_flags;
|
|
int f_spare[5];
|
|
};
|
|
|
|
#define COMPAT_RLIM_INFINITY 0x7fffffffUL
|
|
|
|
typedef u32 compat_old_sigset_t; /* at least 32 bits */
|
|
|
|
#define _COMPAT_NSIG 128 /* Don't ask !$@#% ... */
|
|
#define _COMPAT_NSIG_BPW 32
|
|
|
|
typedef u32 compat_sigset_word;
|
|
|
|
#define COMPAT_OFF_T_MAX 0x7fffffff
|
|
|
|
/*
|
|
* A pointer passed in from user mode. This should not
|
|
* be used for syscall parameters, just declare them
|
|
* as pointers because the syscall entry code will have
|
|
* appropriately converted them already.
|
|
*/
|
|
|
|
static inline void __user *compat_ptr(compat_uptr_t uptr)
|
|
{
|
|
/* cast to a __user pointer via "unsigned long" makes sparse happy */
|
|
return (void __user *)(unsigned long)(long)uptr;
|
|
}
|
|
|
|
static inline compat_uptr_t ptr_to_compat(void __user *uptr)
|
|
{
|
|
return (u32)(unsigned long)uptr;
|
|
}
|
|
|
|
static inline void __user *arch_compat_alloc_user_space(long len)
|
|
{
|
|
struct pt_regs *regs = (struct pt_regs *)
|
|
((unsigned long) current_thread_info() + THREAD_SIZE - 32) - 1;
|
|
|
|
return (void __user *) (regs->regs[29] - len);
|
|
}
|
|
|
|
struct compat_ipc64_perm {
|
|
compat_key_t key;
|
|
__compat_uid32_t uid;
|
|
__compat_gid32_t gid;
|
|
__compat_uid32_t cuid;
|
|
__compat_gid32_t cgid;
|
|
compat_mode_t mode;
|
|
unsigned short seq;
|
|
unsigned short __pad2;
|
|
compat_ulong_t __unused1;
|
|
compat_ulong_t __unused2;
|
|
};
|
|
|
|
struct compat_semid64_ds {
|
|
struct compat_ipc64_perm sem_perm;
|
|
compat_ulong_t sem_otime;
|
|
compat_ulong_t sem_ctime;
|
|
compat_ulong_t sem_nsems;
|
|
compat_ulong_t sem_otime_high;
|
|
compat_ulong_t sem_ctime_high;
|
|
};
|
|
|
|
struct compat_msqid64_ds {
|
|
struct compat_ipc64_perm msg_perm;
|
|
#ifndef CONFIG_CPU_LITTLE_ENDIAN
|
|
compat_ulong_t msg_stime_high;
|
|
#endif
|
|
compat_ulong_t msg_stime;
|
|
#ifdef CONFIG_CPU_LITTLE_ENDIAN
|
|
compat_ulong_t msg_stime_high;
|
|
#endif
|
|
#ifndef CONFIG_CPU_LITTLE_ENDIAN
|
|
compat_ulong_t msg_rtime_high;
|
|
#endif
|
|
compat_ulong_t msg_rtime;
|
|
#ifdef CONFIG_CPU_LITTLE_ENDIAN
|
|
compat_ulong_t msg_rtime_high;
|
|
#endif
|
|
#ifndef CONFIG_CPU_LITTLE_ENDIAN
|
|
compat_ulong_t msg_ctime_high;
|
|
#endif
|
|
compat_ulong_t msg_ctime;
|
|
#ifdef CONFIG_CPU_LITTLE_ENDIAN
|
|
compat_ulong_t msg_ctime_high;
|
|
#endif
|
|
compat_ulong_t msg_cbytes;
|
|
compat_ulong_t msg_qnum;
|
|
compat_ulong_t msg_qbytes;
|
|
compat_pid_t msg_lspid;
|
|
compat_pid_t msg_lrpid;
|
|
compat_ulong_t __unused4;
|
|
compat_ulong_t __unused5;
|
|
};
|
|
|
|
struct compat_shmid64_ds {
|
|
struct compat_ipc64_perm shm_perm;
|
|
compat_size_t shm_segsz;
|
|
compat_ulong_t shm_atime;
|
|
compat_ulong_t shm_dtime;
|
|
compat_ulong_t shm_ctime;
|
|
compat_pid_t shm_cpid;
|
|
compat_pid_t shm_lpid;
|
|
compat_ulong_t shm_nattch;
|
|
compat_ushort_t shm_atime_high;
|
|
compat_ushort_t shm_dtime_high;
|
|
compat_ushort_t shm_ctime_high;
|
|
compat_ushort_t __unused2;
|
|
};
|
|
|
|
/* MIPS has unusual order of fields in stack_t */
|
|
typedef struct compat_sigaltstack {
|
|
compat_uptr_t ss_sp;
|
|
compat_size_t ss_size;
|
|
int ss_flags;
|
|
} compat_stack_t;
|
|
#define compat_sigaltstack compat_sigaltstack
|
|
|
|
static inline int is_compat_task(void)
|
|
{
|
|
return test_thread_flag(TIF_32BIT_ADDR);
|
|
}
|
|
|
|
#endif /* _ASM_COMPAT_H */
|