Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

UPSTREAM: signal: support CLONE_PIDFD with pidfd_send_signal

Browse source 
Let pidfd_send_signal() use pidfds retrieved via CLONE_PIDFD.  With this
patch pidfd_send_signal() becomes independent of procfs.  This fullfils
the request made when we merged the pidfd_send_signal() patchset.  The
pidfd_send_signal() syscall is now always available allowing for it to
be used by users without procfs mounted or even users without procfs
support compiled into the kernel.

Signed-off-by: Christian Brauner <christian@brauner.io>
Co-developed-by: Jann Horn <jannh@google.com>
Signed-off-by: Jann Horn <jannh@google.com>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: David Howells <dhowells@redhat.com>
Cc: "Michael Kerrisk (man-pages)" <mtk.manpages@gmail.com>
Cc: Andy Lutomirsky <luto@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Aleksa Sarai <cyphar@cyphar.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>

(cherry picked from commit 2151ad1b067275730de1b38c7257478cae47d29e)

Bug: 135608568
Test: test program using syscall(__NR_sys_pidfd_open,..) and poll()
Change-Id: If6ee59279f41e0ae3c6d9e24f7b5481f23aab469
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
This commit is contained in:
Christian Brauner 2019-04-17 22:50:25 +02:00 committed by Joel Fernandes (Google)
parent 66faab946a
commit 5eecbc68ed
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kernel/signal.c
View file

@ -3289,7 +3289,6 @@ SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
return kill_something_info(sig, &info, pid); return kill_something_info(sig, &info, pid);
} }
#ifdef CONFIG_PROC_FS
/* /*
* Verify that the signaler and signalee either are in the same pid namespace * Verify that the signaler and signalee either are in the same pid namespace
* or that the signaler's pid namespace is an ancestor of the signalee's pid * or that the signaler's pid namespace is an ancestor of the signalee's pid
@ -3326,6 +3325,14 @@ static int copy_siginfo_from_user_any(siginfo_t *kinfo, siginfo_t __user *info)
return copy_from_user(kinfo, info, sizeof(siginfo_t)); return copy_from_user(kinfo, info, sizeof(siginfo_t));
} }
static struct pid *pidfd_to_pid(const struct file *file)
{
if (file->f_op == &pidfd_fops)
return file->private_data;
return tgid_pidfd_to_pid(file);
}
/** /**
* sys_pidfd_send_signal - send a signal to a process through a task file * sys_pidfd_send_signal - send a signal to a process through a task file
* descriptor * descriptor
@ -3362,7 +3369,7 @@ SYSCALL_DEFINE4(pidfd_send_signal, int, pidfd, int, sig,
return -EBADF; return -EBADF;
/* Is this a pidfd? */ /* Is this a pidfd? */
pid = tgid_pidfd_to_pid(f.file); pid = pidfd_to_pid(f.file);
if (IS_ERR(pid)) { if (IS_ERR(pid)) {
ret = PTR_ERR(pid); ret = PTR_ERR(pid);
goto err; goto err;
@ -3396,7 +3403,6 @@ SYSCALL_DEFINE4(pidfd_send_signal, int, pidfd, int, sig,
fdput(f); fdput(f);
return ret; return ret;
} }
#endif /* CONFIG_PROC_FS */
static int static int
do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info) do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)

3
kernel/sys_ni.c
View file

@ -162,9 +162,6 @@ COND_SYSCALL(syslog);
/* kernel/sched/core.c */ /* kernel/sched/core.c */
/* kernel/signal.c */
COND_SYSCALL(pidfd_send_signal);
/* kernel/sys.c */ /* kernel/sys.c */
COND_SYSCALL(setregid); COND_SYSCALL(setregid);
COND_SYSCALL(setgid); COND_SYSCALL(setgid);