diff options
| author | Christian Brauner <brauner@kernel.org> | 2023-03-27 20:22:52 +0200 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2023-04-03 11:16:57 +0200 |
| commit | ca7707f5430ad6b1c9cb7cee0a7f67d69328bb2d (patch) | |
| tree | 1c154103939671c5ffe46332ec3f7ef28ada69b2 /kernel/fork.c | |
| parent | pid: add pidfd_prepare() (diff) | |
| download | linux-ca7707f5430ad6b1c9cb7cee0a7f67d69328bb2d.tar.xz linux-ca7707f5430ad6b1c9cb7cee0a7f67d69328bb2d.zip | |
fork: use pidfd_prepare()
Stop open-coding get_unused_fd_flags() and anon_inode_getfile(). That's
brittle just for keeping the flags between both calls in sync. Use the
dedicated helper.
Message-Id: <20230327-pidfd-file-api-v1-2-5c0e9a3158e4@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index a34395bd708a..67bec6f1cb7a 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -2376,21 +2376,12 @@ static __latent_entropy struct task_struct *copy_process( * if the fd table isn't shared). */ if (clone_flags & CLONE_PIDFD) { - retval = get_unused_fd_flags(O_RDWR | O_CLOEXEC); + /* Note that no task has been attached to @pid yet. */ + retval = __pidfd_prepare(pid, O_RDWR | O_CLOEXEC, &pidfile); if (retval < 0) goto bad_fork_free_pid; - pidfd = retval; - pidfile = anon_inode_getfile("[pidfd]", &pidfd_fops, pid, - O_RDWR | O_CLOEXEC); - if (IS_ERR(pidfile)) { - put_unused_fd(pidfd); - retval = PTR_ERR(pidfile); - goto bad_fork_free_pid; - } - get_pid(pid); /* held by pidfile now */ - retval = put_user(pidfd, args->pidfd); if (retval) goto bad_fork_put_pidfd; |