Some kernel files may include both linux/compat.h and asm/compat.h directly or indirectly. Since both header files contain is_compat_task() under !CONFIG_COMPAT, compiling them with !CONFIG_COMPAT will eventually fail. Such files include kernel/auditsc.c, kernel/seccomp.c and init/do_mountfs.c (do_mountfs.c may read asm/compat.h via asm/ftrace.h once ftrace is implemented). So this patch proactively 1) removes is_compat_task() under !CONFIG_COMPAT from asm/compat.h 2) replaces asm/compat.h to linux/compat.h in kernel/*.c, but asm/compat.h is still necessary in ptrace.c and process.c because they use is_compat_thread(). Acked-by: Will Deacon <will.deacon@arm.com> Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
		
			
				
	
	
		
			315 lines
		
	
	
	
		
			7 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			315 lines
		
	
	
	
		
			7 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (C) 2012 ARM Ltd.
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or modify
 | 
						|
 * it under the terms of the GNU General Public License version 2 as
 | 
						|
 * published by the Free Software Foundation.
 | 
						|
 *
 | 
						|
 * This program is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
 * GNU General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU General Public License
 | 
						|
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
						|
 */
 | 
						|
#ifndef __ASM_COMPAT_H
 | 
						|
#define __ASM_COMPAT_H
 | 
						|
#ifdef __KERNEL__
 | 
						|
#ifdef CONFIG_COMPAT
 | 
						|
 | 
						|
/*
 | 
						|
 * Architecture specific compatibility types
 | 
						|
 */
 | 
						|
#include <linux/types.h>
 | 
						|
#include <linux/sched.h>
 | 
						|
#include <linux/ptrace.h>
 | 
						|
 | 
						|
#define COMPAT_USER_HZ		100
 | 
						|
#ifdef __AARCH64EB__
 | 
						|
#define COMPAT_UTS_MACHINE	"armv8b\0\0"
 | 
						|
#else
 | 
						|
#define COMPAT_UTS_MACHINE	"armv8l\0\0"
 | 
						|
#endif
 | 
						|
 | 
						|
typedef u32		compat_size_t;
 | 
						|
typedef s32		compat_ssize_t;
 | 
						|
typedef s32		compat_time_t;
 | 
						|
typedef s32		compat_clock_t;
 | 
						|
typedef s32		compat_pid_t;
 | 
						|
typedef u32		__compat_uid_t;
 | 
						|
typedef u32		__compat_gid_t;
 | 
						|
typedef u16		__compat_uid16_t;
 | 
						|
typedef u16		__compat_gid16_t;
 | 
						|
typedef u32		__compat_uid32_t;
 | 
						|
typedef u32		__compat_gid32_t;
 | 
						|
typedef u16		compat_mode_t;
 | 
						|
typedef u32		compat_ino_t;
 | 
						|
typedef u32		compat_dev_t;
 | 
						|
typedef s32		compat_off_t;
 | 
						|
typedef s64		compat_loff_t;
 | 
						|
typedef s32		compat_nlink_t;
 | 
						|
typedef u16		compat_ipc_pid_t;
 | 
						|
typedef s32		compat_daddr_t;
 | 
						|
typedef u32		compat_caddr_t;
 | 
						|
typedef __kernel_fsid_t	compat_fsid_t;
 | 
						|
typedef s32		compat_key_t;
 | 
						|
typedef s32		compat_timer_t;
 | 
						|
 | 
						|
typedef s16		compat_short_t;
 | 
						|
typedef s32		compat_int_t;
 | 
						|
typedef s32		compat_long_t;
 | 
						|
typedef s64		compat_s64;
 | 
						|
typedef u16		compat_ushort_t;
 | 
						|
typedef u32		compat_uint_t;
 | 
						|
typedef u32		compat_ulong_t;
 | 
						|
typedef u64		compat_u64;
 | 
						|
typedef u32		compat_uptr_t;
 | 
						|
 | 
						|
struct compat_timespec {
 | 
						|
	compat_time_t	tv_sec;
 | 
						|
	s32		tv_nsec;
 | 
						|
};
 | 
						|
 | 
						|
struct compat_timeval {
 | 
						|
	compat_time_t	tv_sec;
 | 
						|
	s32		tv_usec;
 | 
						|
};
 | 
						|
 | 
						|
struct compat_stat {
 | 
						|
#ifdef __AARCH64EB__
 | 
						|
	short		st_dev;
 | 
						|
	short		__pad1;
 | 
						|
#else
 | 
						|
	compat_dev_t	st_dev;
 | 
						|
#endif
 | 
						|
	compat_ino_t	st_ino;
 | 
						|
	compat_mode_t	st_mode;
 | 
						|
	compat_ushort_t	st_nlink;
 | 
						|
	__compat_uid16_t	st_uid;
 | 
						|
	__compat_gid16_t	st_gid;
 | 
						|
#ifdef __AARCH64EB__
 | 
						|
	short		st_rdev;
 | 
						|
	short		__pad2;
 | 
						|
#else
 | 
						|
	compat_dev_t	st_rdev;
 | 
						|
#endif
 | 
						|
	compat_off_t	st_size;
 | 
						|
	compat_off_t	st_blksize;
 | 
						|
	compat_off_t	st_blocks;
 | 
						|
	compat_time_t	st_atime;
 | 
						|
	compat_ulong_t	st_atime_nsec;
 | 
						|
	compat_time_t	st_mtime;
 | 
						|
	compat_ulong_t	st_mtime_nsec;
 | 
						|
	compat_time_t	st_ctime;
 | 
						|
	compat_ulong_t	st_ctime_nsec;
 | 
						|
	compat_ulong_t	__unused4[2];
 | 
						|
};
 | 
						|
 | 
						|
struct compat_flock {
 | 
						|
	short		l_type;
 | 
						|
	short		l_whence;
 | 
						|
	compat_off_t	l_start;
 | 
						|
	compat_off_t	l_len;
 | 
						|
	compat_pid_t	l_pid;
 | 
						|
};
 | 
						|
 | 
						|
#define F_GETLK64	12	/*  using 'struct flock64' */
 | 
						|
#define F_SETLK64	13
 | 
						|
#define F_SETLKW64	14
 | 
						|
 | 
						|
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_blocks;
 | 
						|
	int		f_bfree;
 | 
						|
	int		f_bavail;
 | 
						|
	int		f_files;
 | 
						|
	int		f_ffree;
 | 
						|
	compat_fsid_t	f_fsid;
 | 
						|
	int		f_namelen;	/* SunOS ignores this field. */
 | 
						|
	int		f_frsize;
 | 
						|
	int		f_flags;
 | 
						|
	int		f_spare[4];
 | 
						|
};
 | 
						|
 | 
						|
#define COMPAT_RLIM_INFINITY		0xffffffff
 | 
						|
 | 
						|
typedef u32		compat_old_sigset_t;
 | 
						|
 | 
						|
#define _COMPAT_NSIG		64
 | 
						|
#define _COMPAT_NSIG_BPW	32
 | 
						|
 | 
						|
typedef u32		compat_sigset_word;
 | 
						|
 | 
						|
typedef union compat_sigval {
 | 
						|
	compat_int_t	sival_int;
 | 
						|
	compat_uptr_t	sival_ptr;
 | 
						|
} compat_sigval_t;
 | 
						|
 | 
						|
typedef struct compat_siginfo {
 | 
						|
	int si_signo;
 | 
						|
	int si_errno;
 | 
						|
	int si_code;
 | 
						|
 | 
						|
	union {
 | 
						|
		/* The padding is the same size as AArch64. */
 | 
						|
		int _pad[128/sizeof(int) - 3];
 | 
						|
 | 
						|
		/* kill() */
 | 
						|
		struct {
 | 
						|
			compat_pid_t _pid;	/* sender's pid */
 | 
						|
			__compat_uid32_t _uid;	/* sender's uid */
 | 
						|
		} _kill;
 | 
						|
 | 
						|
		/* POSIX.1b timers */
 | 
						|
		struct {
 | 
						|
			compat_timer_t _tid;	/* timer id */
 | 
						|
			int _overrun;		/* overrun count */
 | 
						|
			compat_sigval_t _sigval;	/* same as below */
 | 
						|
			int _sys_private;       /* not to be passed to user */
 | 
						|
		} _timer;
 | 
						|
 | 
						|
		/* POSIX.1b signals */
 | 
						|
		struct {
 | 
						|
			compat_pid_t _pid;	/* sender's pid */
 | 
						|
			__compat_uid32_t _uid;	/* sender's uid */
 | 
						|
			compat_sigval_t _sigval;
 | 
						|
		} _rt;
 | 
						|
 | 
						|
		/* SIGCHLD */
 | 
						|
		struct {
 | 
						|
			compat_pid_t _pid;	/* which child */
 | 
						|
			__compat_uid32_t _uid;	/* sender's uid */
 | 
						|
			int _status;		/* exit code */
 | 
						|
			compat_clock_t _utime;
 | 
						|
			compat_clock_t _stime;
 | 
						|
		} _sigchld;
 | 
						|
 | 
						|
		/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
 | 
						|
		struct {
 | 
						|
			compat_uptr_t _addr; /* faulting insn/memory ref. */
 | 
						|
			short _addr_lsb; /* LSB of the reported address */
 | 
						|
		} _sigfault;
 | 
						|
 | 
						|
		/* SIGPOLL */
 | 
						|
		struct {
 | 
						|
			compat_long_t _band;	/* POLL_IN, POLL_OUT, POLL_MSG */
 | 
						|
			int _fd;
 | 
						|
		} _sigpoll;
 | 
						|
	} _sifields;
 | 
						|
} compat_siginfo_t;
 | 
						|
 | 
						|
#define COMPAT_OFF_T_MAX	0x7fffffff
 | 
						|
#define COMPAT_LOFF_T_MAX	0x7fffffffffffffffL
 | 
						|
 | 
						|
/*
 | 
						|
 * 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)
 | 
						|
{
 | 
						|
	return (void __user *)(unsigned long)uptr;
 | 
						|
}
 | 
						|
 | 
						|
static inline compat_uptr_t ptr_to_compat(void __user *uptr)
 | 
						|
{
 | 
						|
	return (u32)(unsigned long)uptr;
 | 
						|
}
 | 
						|
 | 
						|
#define compat_user_stack_pointer() (user_stack_pointer(current_pt_regs()))
 | 
						|
 | 
						|
static inline void __user *arch_compat_alloc_user_space(long len)
 | 
						|
{
 | 
						|
	return (void __user *)compat_user_stack_pointer() - 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;
 | 
						|
	unsigned short mode;
 | 
						|
	unsigned short __pad1;
 | 
						|
	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_time_t  sem_otime;
 | 
						|
	compat_ulong_t __unused1;
 | 
						|
	compat_time_t  sem_ctime;
 | 
						|
	compat_ulong_t __unused2;
 | 
						|
	compat_ulong_t sem_nsems;
 | 
						|
	compat_ulong_t __unused3;
 | 
						|
	compat_ulong_t __unused4;
 | 
						|
};
 | 
						|
 | 
						|
struct compat_msqid64_ds {
 | 
						|
	struct compat_ipc64_perm msg_perm;
 | 
						|
	compat_time_t  msg_stime;
 | 
						|
	compat_ulong_t __unused1;
 | 
						|
	compat_time_t  msg_rtime;
 | 
						|
	compat_ulong_t __unused2;
 | 
						|
	compat_time_t  msg_ctime;
 | 
						|
	compat_ulong_t __unused3;
 | 
						|
	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_time_t  shm_atime;
 | 
						|
	compat_ulong_t __unused1;
 | 
						|
	compat_time_t  shm_dtime;
 | 
						|
	compat_ulong_t __unused2;
 | 
						|
	compat_time_t  shm_ctime;
 | 
						|
	compat_ulong_t __unused3;
 | 
						|
	compat_pid_t   shm_cpid;
 | 
						|
	compat_pid_t   shm_lpid;
 | 
						|
	compat_ulong_t shm_nattch;
 | 
						|
	compat_ulong_t __unused4;
 | 
						|
	compat_ulong_t __unused5;
 | 
						|
};
 | 
						|
 | 
						|
static inline int is_compat_task(void)
 | 
						|
{
 | 
						|
	return test_thread_flag(TIF_32BIT);
 | 
						|
}
 | 
						|
 | 
						|
static inline int is_compat_thread(struct thread_info *thread)
 | 
						|
{
 | 
						|
	return test_ti_thread_flag(thread, TIF_32BIT);
 | 
						|
}
 | 
						|
 | 
						|
#else /* !CONFIG_COMPAT */
 | 
						|
 | 
						|
static inline int is_compat_thread(struct thread_info *thread)
 | 
						|
{
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
#endif /* CONFIG_COMPAT */
 | 
						|
#endif /* __KERNEL__ */
 | 
						|
#endif /* __ASM_COMPAT_H */
 |