Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9aae8fc0 authored by Al Viro's avatar Al Viro
Browse files

switch rt_tgsigqueueinfo to COMPAT_SYSCALL_DEFINE



C ABI violations on sparc, ppc and mips

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 5cf22100
Loading
Loading
Loading
Loading
+0 −2
Original line number Original line Diff line number Diff line
@@ -241,8 +241,6 @@ extern int do_send_sig_info(int sig, struct siginfo *info,
				struct task_struct *p, bool group);
				struct task_struct *p, bool group);
extern int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p);
extern int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p);
extern int __group_send_sig_info(int, struct siginfo *, struct task_struct *);
extern int __group_send_sig_info(int, struct siginfo *, struct task_struct *);
extern long do_rt_tgsigqueueinfo(pid_t tgid, pid_t pid, int sig,
				 siginfo_t *info);
extern int do_sigtimedwait(const sigset_t *, siginfo_t *,
extern int do_sigtimedwait(const sigset_t *, siginfo_t *,
				const struct timespec *);
				const struct timespec *);
extern int sigprocmask(int, sigset_t *, sigset_t *);
extern int sigprocmask(int, sigset_t *, sigset_t *);
+0 −11
Original line number Original line Diff line number Diff line
@@ -1025,17 +1025,6 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait, compat_sigset_t __user *, uthese,
	return ret;
	return ret;
}
}


asmlinkage long
compat_sys_rt_tgsigqueueinfo(compat_pid_t tgid, compat_pid_t pid, int sig,
			     struct compat_siginfo __user *uinfo)
{
	siginfo_t info;

	if (copy_siginfo_from_user32(&info, uinfo))
		return -EFAULT;
	return do_rt_tgsigqueueinfo(tgid, pid, sig, &info);
}

#ifdef __ARCH_WANT_COMPAT_SYS_TIME
#ifdef __ARCH_WANT_COMPAT_SYS_TIME


/* compat_time_t is a 32 bit "long" and needs to get converted. */
/* compat_time_t is a 32 bit "long" and needs to get converted. */
+16 −1
Original line number Original line Diff line number Diff line
@@ -3030,7 +3030,7 @@ COMPAT_SYSCALL_DEFINE3(rt_sigqueueinfo,
#endif
#endif
#endif
#endif


long do_rt_tgsigqueueinfo(pid_t tgid, pid_t pid, int sig, siginfo_t *info)
static int do_rt_tgsigqueueinfo(pid_t tgid, pid_t pid, int sig, siginfo_t *info)
{
{
	/* This is only valid for single tasks */
	/* This is only valid for single tasks */
	if (pid <= 0 || tgid <= 0)
	if (pid <= 0 || tgid <= 0)
@@ -3060,6 +3060,21 @@ SYSCALL_DEFINE4(rt_tgsigqueueinfo, pid_t, tgid, pid_t, pid, int, sig,
	return do_rt_tgsigqueueinfo(tgid, pid, sig, &info);
	return do_rt_tgsigqueueinfo(tgid, pid, sig, &info);
}
}


#ifdef CONFIG_COMPAT
COMPAT_SYSCALL_DEFINE4(rt_tgsigqueueinfo,
			compat_pid_t, tgid,
			compat_pid_t, pid,
			int, sig,
			struct compat_siginfo __user *, uinfo)
{
	siginfo_t info;

	if (copy_siginfo_from_user32(&info, uinfo))
		return -EFAULT;
	return do_rt_tgsigqueueinfo(tgid, pid, sig, &info);
}
#endif

int do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact)
int do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact)
{
{
	struct task_struct *t = current;
	struct task_struct *t = current;