qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hurd: Check return value of mach_port_mod_refs() in the dup routine of fcntl() 

Message-ID: <20250310084409.24177-1-zhmingluo@163.com>
This commit is contained in:
Zhaoming Luo 2025-03-10 16:44:09 +08:00 committed by Samuel Thibault
parent 1c9ac027a5
commit e150ee8709
2 changed files with 85 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
sysdeps/mach/hurd/dup3.c
View File

@ -69,6 +69,7 @@ __dup3 (int fd, int fd2, int flags)
{
/* Get a hold of the destination descriptor. */
struct hurd_fd *d2;
error_t err;
__mutex_lock (&_hurd_dtable_lock);
@ -107,22 +108,51 @@ __dup3 (int fd, int fd2, int flags)
}
else
{
/* Give the ports each a user ref for the new descriptor. */
__mach_port_mod_refs (__mach_task_self (), port,
MACH_PORT_RIGHT_SEND, 1);
if (ctty != MACH_PORT_NULL)
__mach_port_mod_refs (__mach_task_self (), ctty,
MACH_PORT_RIGHT_SEND, 1);
/* Give the io server port a user ref for the new descriptor. */
err = __mach_port_mod_refs (__mach_task_self (), port,
MACH_PORT_RIGHT_SEND, 1);
/* Install the ports and flags in the new descriptor slot. */
__spin_lock (&d2->port.lock);
if (flags & O_CLOEXEC)
d2->flags = d_flags | FD_CLOEXEC;
else
/* dup clears FD_CLOEXEC. */
d2->flags = d_flags & ~FD_CLOEXEC;
_hurd_port_set (&d2->ctty, ctty);
_hurd_port_locked_set (&d2->port, port); /* Unlocks D2. */
if (err == KERN_UREFS_OVERFLOW)
fd2 = __hurd_fail (EMFILE);
else if (err)
fd2 = __hurd_fail (EINVAL);
else if (ctty != MACH_PORT_NULL)
{
/* We have confirmed the io server port has got a user ref
count, now give ctty port a user ref for the new
descriptor. */
err = __mach_port_mod_refs (__mach_task_self (), ctty,
MACH_PORT_RIGHT_SEND, 1);
if (err)
{
/* In this case the io server port has got a ref count
but the ctty port failed to get one, so we need to
clean the ref count we just assigned. */
__mach_port_mod_refs (__mach_task_self (), port,
MACH_PORT_RIGHT_SEND, -1);
if (err == KERN_UREFS_OVERFLOW)
fd2 = __hurd_fail (EMFILE);
else
fd2 = __hurd_fail (EINVAL);
}
}
if (!err)
{
/* The ref counts of the ports are incremented
successfully. */
/* Install the ports and flags in the new descriptor slot. */
__spin_lock (&d2->port.lock);
if (flags & O_CLOEXEC)
d2->flags = d_flags | FD_CLOEXEC;
else
/* dup clears FD_CLOEXEC. */
d2->flags = d_flags & ~FD_CLOEXEC;
_hurd_port_set (&d2->ctty, ctty);
_hurd_port_locked_set (&d2->port, port); /* Unlocks D2. */
}
}
}

51
sysdeps/mach/hurd/fcntl.c
View File

@ -83,18 +83,47 @@ __libc_fcntl (int fd, int cmd, ...)
result = -1;
else
{
/* Give the ports each a user ref for the new descriptor. */
__mach_port_mod_refs (__mach_task_self (), port,
MACH_PORT_RIGHT_SEND, 1);
if (ctty != MACH_PORT_NULL)
__mach_port_mod_refs (__mach_task_self (), ctty,
MACH_PORT_RIGHT_SEND, 1);
/* Give the io server port a user ref for the new descriptor. */
err = __mach_port_mod_refs (__mach_task_self (), port,
MACH_PORT_RIGHT_SEND, 1);
/* Install the ports and flags in the new descriptor. */
if (ctty != MACH_PORT_NULL)
_hurd_port_set (&new->ctty, ctty);
new->flags = flags;
_hurd_port_locked_set (&new->port, port); /* Unlocks NEW. */
if (err == KERN_UREFS_OVERFLOW)
result = __hurd_fail (EMFILE);
else if (err)
result = __hurd_fail (EINVAL);
else if (ctty != MACH_PORT_NULL)
{
/* We have confirmed the io server port has got a user ref
count, now give ctty port a user ref for the new
descriptor. */
err = __mach_port_mod_refs (__mach_task_self (), ctty,
MACH_PORT_RIGHT_SEND, 1);
if (err)
{
/* In this case the io server port has got a ref count
but the ctty port fails to get one, so we need to clean
the ref count we just assigned. */
__mach_port_mod_refs (__mach_task_self (), port,
MACH_PORT_RIGHT_SEND, -1);
if (err == KERN_UREFS_OVERFLOW)
result = __hurd_fail (EMFILE);
else
result = __hurd_fail (EINVAL);
}
}
if (!err)
{
/* The ref counts of the ports are incremented successfully. */
/* Install the ports and flags in the new descriptor. */
if (ctty != MACH_PORT_NULL)
_hurd_port_set (&new->ctty, ctty);
new->flags = flags;
/* Unlocks NEW. */
_hurd_port_locked_set (&new->port, port);
}
}
HURD_CRITICAL_END;