kernel/pid.c: implement additional checks upon pidfd_create() parameters
[ Upstream commit 490b9ba881e2c6337bb09b68010803ae98e59f4a ] By adding the pidfd_create() declaration to linux/pid.h, we effectively expose this function to the rest of the kernel. In order to avoid any unintended behavior, or set false expectations upon this function, ensure that constraints are forced upon each of the passed parameters. This includes the checking of whether the passed struct pid is a thread-group leader as pidfd creation is currently limited to such pid types. Link: https://lore.kernel.org/r/2e9b91c2d529d52a003b8b86c45f866153be9eb5.1628398044.git.repnop@google.com Signed-off-by: Matthew Bobrowski <repnop@google.com> Acked-by: Christian Brauner <christian.brauner@ubuntu.com> Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
87924b3e9e
commit
5210c9ef54
1 changed files with 7 additions and 4 deletions
11
kernel/pid.c
11
kernel/pid.c
|
@ -560,6 +560,12 @@ int pidfd_create(struct pid *pid, unsigned int flags)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
|
if (!pid || !pid_has_task(pid, PIDTYPE_TGID))
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
if (flags & ~(O_NONBLOCK | O_RDWR | O_CLOEXEC))
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
fd = anon_inode_getfd("[pidfd]", &pidfd_fops, get_pid(pid),
|
fd = anon_inode_getfd("[pidfd]", &pidfd_fops, get_pid(pid),
|
||||||
flags | O_RDWR | O_CLOEXEC);
|
flags | O_RDWR | O_CLOEXEC);
|
||||||
if (fd < 0)
|
if (fd < 0)
|
||||||
|
@ -599,10 +605,7 @@ SYSCALL_DEFINE2(pidfd_open, pid_t, pid, unsigned int, flags)
|
||||||
if (!p)
|
if (!p)
|
||||||
return -ESRCH;
|
return -ESRCH;
|
||||||
|
|
||||||
if (pid_has_task(p, PIDTYPE_TGID))
|
fd = pidfd_create(p, flags);
|
||||||
fd = pidfd_create(p, flags);
|
|
||||||
else
|
|
||||||
fd = -EINVAL;
|
|
||||||
|
|
||||||
put_pid(p);
|
put_pid(p);
|
||||||
return fd;
|
return fd;
|
||||||
|
|
Loading…
Reference in a new issue