@@ -56,7 +56,8 @@ routines = hurdstartup hurdinit \
ports-get ports-set hurdports hurdmsg \
errno-loc \
hurdlock \
- $(sig) $(dtable) $(inlines) port-cleanup report-wait xattr
+ $(sig) $(dtable) $(inlines) \
+ fd-cleanup port-cleanup report-wait xattr
sig = hurdsig hurdfault siginfo hurd-raise preempt-sig \
trampoline longjmp-ts catch-exc exc2signal hurdkill sigunwind \
thread-self thread-cancel intr-msg catch-signal
new file mode 100644
@@ -0,0 +1,33 @@
+/* Cleanup function for `struct hurd_fd' users.
+ Copyright (C) 1995-2020 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <mach.h>
+#include <hurd/fd.h>
+
+/* We were cancelled while using an fd, and called from the cleanup unwinding.
+ */
+
+void
+_hurd_fd_port_use_cleanup (void *arg)
+{
+ struct _hurd_fd_port_use_data *data = arg;
+
+ _hurd_port_free (&data->d->port, &data->ulink, data->port);
+ if (data->ctty != MACH_PORT_NULL)
+ _hurd_port_free (&data->d->ctty, &data->ctty_ulink, data->ctty);
+}
@@ -35,7 +35,7 @@ _hurd_fd_read (struct hurd_fd *fd, void *buf, size_t *nbytes, loff_t offset)
data = buf;
nread = *nbytes;
- if (err = HURD_FD_PORT_USE (fd, _hurd_ctty_input (port, ctty, readfd)))
+ if (err = HURD_FD_PORT_USE_CANCEL (fd, _hurd_ctty_input (port, ctty, readfd)))
return err;
if (data != buf)
@@ -33,7 +33,7 @@ _hurd_fd_write (struct hurd_fd *fd,
return __io_write (port, buf, *nbytes, offset, &wrote);
}
- err = HURD_FD_PORT_USE (fd, _hurd_ctty_output (port, ctty, writefd));
+ err = HURD_FD_PORT_USE_CANCEL (fd, _hurd_ctty_output (port, ctty, writefd));
if (! err)
*nbytes = wrote;
@@ -92,6 +92,7 @@ extern sigset_t _hurdsig_traced;
/* Shorthand macro for internal library code referencing _hurd_ports (see
<hurd/port.h>). */
+/* Also see __USEPORT_CANCEL. */
#define __USEPORT(which, expr) \
HURD_PORT_USE (&_hurd_ports[INIT_PORT_##which], (expr))
@@ -115,6 +115,7 @@ _hurd_fd_get (int fd)
HURD_FD_USE ((fd), HURD_FD_PORT_USE (descriptor, (expr)))
/* Likewise, but FD is a pointer to the file descriptor structure. */
+/* Also see HURD_FD_PORT_USE_CANCEL. */
#define HURD_FD_PORT_USE(fd, expr) \
({ error_t __result; \
@@ -42,6 +42,7 @@ struct hurd_port
/* Evaluate EXPR with the variable `port' bound to the port in PORTCELL. */
+/* Also see HURD_PORT_USE_CANCEL. */
#define HURD_PORT_USE(portcell, expr) \
({ struct hurd_port *const __p = (portcell); \
@@ -1,4 +1,4 @@
-/* Cleanup function for `struct hurd_port' users who longjmp.
+/* Cleanup function for `struct hurd_port' users.
Copyright (C) 1995-2020 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -28,3 +28,14 @@ _hurd_port_cleanup (void *cleanup_data, jmp_buf env, int val)
{
__mach_port_deallocate (__mach_task_self (), (mach_port_t) cleanup_data);
}
+
+/* We were cancelled while using a port, and called from the cleanup unwinding.
+ */
+
+void
+_hurd_port_use_cleanup (void *arg)
+{
+ struct _hurd_port_use_data *data = arg;
+
+ _hurd_port_free (data->p, &data->link, data->port);
+}
@@ -1,5 +1,10 @@
#ifndef _HURD_H
#include_next <hurd.h>
+
+/* Like __USEPORT, but cleans fd on cancel. */
+#define __USEPORT_CANCEL(which, expr) \
+ HURD_PORT_USE_CANCEL (&_hurd_ports[INIT_PORT_##which], (expr))
+
#ifndef _ISOMAC
libc_hidden_proto (_hurd_exec_paths)
libc_hidden_proto (_hurd_init)
@@ -1,6 +1,47 @@
#ifndef _HURD_FD_H
#include_next <hurd/fd.h>
+
#ifndef _ISOMAC
+#include <libc-lock.h>
+
+struct _hurd_fd_port_use_data
+ {
+ struct hurd_fd *d;
+ struct hurd_userlink ulink, ctty_ulink;
+ io_t port, ctty;
+ };
+
+extern void _hurd_fd_port_use_cleanup (void *arg);
+
+/* Like HURD_DPORT_USE, but cleans fd on cancel. */
+#define HURD_DPORT_USE_CANCEL(fd, expr) \
+ HURD_FD_USE ((fd), HURD_FD_PORT_USE_CANCEL (descriptor, (expr)))
+
+/* Like HURD_FD_PORT_USE, but cleans fd on cancel. */
+#define HURD_FD_PORT_USE_CANCEL(fd, expr) \
+ ({ error_t __result; \
+ void *__crit = _hurd_critical_section_lock (); \
+ struct _hurd_fd_port_use_data __d; \
+ io_t port, ctty; \
+ __d.d = (fd); \
+ __spin_lock (&__d.d->port.lock); \
+ if (__d.d->port.port == MACH_PORT_NULL) \
+ { \
+ __spin_unlock (&__d.d->port.lock); \
+ _hurd_critical_section_unlock (__crit); \
+ __result = EBADF; \
+ } \
+ else \
+ { \
+ __d.ctty = ctty = _hurd_port_get (&__d.d->ctty, &__d.ctty_ulink); \
+ __d.port = port = _hurd_port_locked_get (&__d.d->port, &__d.ulink); \
+ __libc_cleanup_push (_hurd_fd_port_use_cleanup, &__d); \
+ _hurd_critical_section_unlock (__crit); \
+ __result = (expr); \
+ __libc_cleanup_pop (1); \
+ } \
+ __result; })
+
libc_hidden_proto (_hurd_intern_fd)
libc_hidden_proto (_hurd_fd_error)
libc_hidden_proto (_hurd_fd_error_signal)
@@ -1,6 +1,30 @@
#ifndef _HURD_PORT_H
#include_next <hurd/port.h>
+
#ifndef _ISOMAC
+struct _hurd_port_use_data
+ {
+ struct hurd_port *p;
+ struct hurd_userlink link;
+ mach_port_t port;
+ };
+
+extern void _hurd_port_use_cleanup (void *arg);
+
+/* Like HURD_PORT_USE, but cleans fd on cancel. */
+#define HURD_PORT_USE_CANCEL(portcell, expr) \
+ ({ struct _hurd_port_use_data __d; \
+ __typeof(expr) __result; \
+ void *__crit; \
+ __d.p = (portcell); \
+ __crit = _hurd_critical_section_lock (); \
+ __d.port = port = _hurd_port_get (__d.p, &__d.link); \
+ __libc_cleanup_push (_hurd_port_use_cleanup, &__d); \
+ _hurd_critical_section_unlock (__crit); \
+ __result = (expr); \
+ __libc_cleanup_pop (1); \
+ __result; })
+
libc_hidden_proto (_hurd_port_locked_get)
libc_hidden_proto (_hurd_port_locked_set)
#ifdef _HURD_PORT_H_HIDDEN_DEF
@@ -40,12 +40,12 @@ __recv (int fd, void *buf, size_t n, int flags)
int cancel_oldtype;
cancel_oldtype = LIBC_CANCEL_ASYNC();
- err = HURD_DPORT_USE (fd, __socket_recv (port, &addrport,
- flags, &bufp, &nread,
- &ports, &nports,
- &cdata, &clen,
- &flags,
- n));
+ err = HURD_DPORT_USE_CANCEL (fd, __socket_recv (port, &addrport,
+ flags, &bufp, &nread,
+ &ports, &nports,
+ &cdata, &clen,
+ &flags,
+ n));
LIBC_CANCEL_RESET (cancel_oldtype);
if (err == MIG_BAD_ID || err == EOPNOTSUPP)
@@ -43,12 +43,12 @@ __recvfrom (int fd, void *buf, size_t n, int flags, __SOCKADDR_ARG addrarg,
int cancel_oldtype;
cancel_oldtype = LIBC_CANCEL_ASYNC();
- err = HURD_DPORT_USE (fd, __socket_recv (port, &addrport,
- flags, &bufp, &nread,
- &ports, &nports,
- &cdata, &clen,
- &flags,
- n));
+ err = HURD_DPORT_USE_CANCEL (fd, __socket_recv (port, &addrport,
+ flags, &bufp, &nread,
+ &ports, &nports,
+ &cdata, &clen,
+ &flags,
+ n));
LIBC_CANCEL_RESET (cancel_oldtype);
if (err)
@@ -58,7 +58,7 @@ __libc_recvmsg (int fd, struct msghdr *message, int flags)
while (err == EINTR);
if (!err)
do
- err = __USEPORT (AUTH, __auth_user_authenticate (port,
+ err = __USEPORT_CANCEL (AUTH, __auth_user_authenticate (port,
ref, MACH_MSG_TYPE_MAKE_SEND,
result));
while (err == EINTR);
@@ -86,11 +86,11 @@ __libc_recvmsg (int fd, struct msghdr *message, int flags)
buf = data;
cancel_oldtype = LIBC_CANCEL_ASYNC();
- err = HURD_DPORT_USE (fd, __socket_recv (port, &aport,
- flags, &data, &len,
- &ports, &nports,
- &cdata, &clen,
- &message->msg_flags, amount));
+ err = HURD_DPORT_USE_CANCEL (fd, __socket_recv (port, &aport,
+ flags, &data, &len,
+ &ports, &nports,
+ &cdata, &clen,
+ &message->msg_flags, amount));
LIBC_CANCEL_RESET (cancel_oldtype);
if (err)
return __hurd_sockfail (fd, flags, err);
@@ -31,10 +31,10 @@ __send (int fd, const void *buf, size_t n, int flags)
int cancel_oldtype;
cancel_oldtype = LIBC_CANCEL_ASYNC();
- err = HURD_DPORT_USE (fd, __socket_send (port, MACH_PORT_NULL,
- flags, buf, n,
- NULL, MACH_MSG_TYPE_COPY_SEND, 0,
- NULL, 0, &wrote));
+ err = HURD_DPORT_USE_CANCEL (fd, __socket_send (port, MACH_PORT_NULL,
+ flags, buf, n,
+ NULL, MACH_MSG_TYPE_COPY_SEND, 0,
+ NULL, 0, &wrote));
LIBC_CANCEL_RESET (cancel_oldtype);
if (err == MIG_BAD_ID || err == EOPNOTSUPP)
@@ -174,7 +174,7 @@ __libc_sendmsg (int fd, const struct msghdr *message, int flags)
err = EIEIO;
}
- err = HURD_DPORT_USE (fd,
+ err = HURD_DPORT_USE_CANCEL (fd,
({
if (err)
err = __socket_create_address (port,
@@ -73,7 +73,7 @@ __sendto (int fd,
return err_port;
}
- err = HURD_DPORT_USE (fd,
+ err = HURD_DPORT_USE_CANCEL (fd,
({
if (addr != NULL)
err = create_address_port (port, addr, addr_len,