archive/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-08-15 22:21:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

pidfs: move setting flags into pidfs_alloc_file()

Browse source 
Instead od adding it into __pidfd_prepare() place it where the actual
file allocation happens and update the outdated comment.

Link: https://lore.kernel.org/r/20250305-work-pidfs-kill_on_last_close-v3-3-c8c3d8361705@kernel.org
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Christian Brauner 2025-03-05 11:08:13 +01:00
parent b573bf6f69
commit 3155a19407
No known key found for this signature in database
GPG key ID: 91C61BC06578DCA2
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fs/pidfs.c
View file

@ -696,6 +696,10 @@ struct file *pidfs_alloc_file(struct pid *pid, unsigned int flags)
return ERR_PTR(ret); return ERR_PTR(ret);
pidfd_file = dentry_open(&path, flags, current_cred()); pidfd_file = dentry_open(&path, flags, current_cred());
/* Raise PIDFD_THREAD explicitly as do_dentry_open() strips it. */
if (!IS_ERR(pidfd_file))
pidfd_file->f_flags |= (flags & PIDFD_THREAD);
path_put(&path); path_put(&path);
return pidfd_file; return pidfd_file;
} }

5
kernel/fork.c
View file

@ -2042,11 +2042,6 @@ static int __pidfd_prepare(struct pid *pid, unsigned int flags, struct file **re
if (IS_ERR(pidfd_file)) if (IS_ERR(pidfd_file))
return PTR_ERR(pidfd_file); return PTR_ERR(pidfd_file);
/*
* anon_inode_getfile() ignores everything outside of the
* O_ACCMODE | O_NONBLOCK mask, set PIDFD_THREAD manually.
*/
pidfd_file->f_flags |= (flags & PIDFD_THREAD);
*ret = pidfd_file; *ret = pidfd_file;
return take_fd(pidfd); return take_fd(pidfd);
} }