diff options
| author | Christian Brauner <christian.brauner@ubuntu.com> | 2019-10-17 12:18:32 +0200 |
|---|---|---|
| committer | Christian Brauner <christian.brauner@ubuntu.com> | 2019-10-17 15:37:00 +0200 |
| commit | 1e1d0f0b1a3e3533ea4cd4021eb251e53827c70b (patch) | |
| tree | 9541039708759d3cddf4a724090d3f3f54ab442d /kernel/pid.c | |
| parent | 1722c14a2097634a7ba37000c0ec7d9409918b64 (diff) | |
| download | linux-1e1d0f0b1a3e3533ea4cd4021eb251e53827c70b.tar.gz linux-1e1d0f0b1a3e3533ea4cd4021eb251e53827c70b.tar.bz2 linux-1e1d0f0b1a3e3533ea4cd4021eb251e53827c70b.zip | |
pid: use pid_has_task() in pidfd_open()
Use the new pid_has_task() helper in pidfd_open(). This simplifies the
code and avoids taking rcu_read_{lock,unlock}() and leads to overall
nicer code.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Link: https://lore.kernel.org/r/20191017101832.5985-5-christian.brauner@ubuntu.com
Diffstat (limited to 'kernel/pid.c')
| -rw-r--r-- | kernel/pid.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/kernel/pid.c b/kernel/pid.c index 124d40b239b1..7b5f6c963d72 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -497,7 +497,7 @@ static int pidfd_create(struct pid *pid) */ SYSCALL_DEFINE2(pidfd_open, pid_t, pid, unsigned int, flags) { - int fd, ret; + int fd; struct pid *p; if (flags) @@ -510,13 +510,11 @@ SYSCALL_DEFINE2(pidfd_open, pid_t, pid, unsigned int, flags) if (!p) return -ESRCH; - ret = 0; - rcu_read_lock(); - if (!pid_task(p, PIDTYPE_TGID)) - ret = -EINVAL; - rcu_read_unlock(); + if (pid_has_task(p, PIDTYPE_TGID)) + fd = pidfd_create(p); + else + fd = -EINVAL; - fd = ret ?: pidfd_create(p); put_pid(p); return fd; } |