2020-01-01 00:14:33 +00:00
|
|
|
|
/* Copyright (C) 1991-2020 Free Software Foundation, Inc.
|
1997-02-15 04:31:36 +00:00
|
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 04:58:11 +00:00
|
|
|
|
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.
|
1997-02-15 04:31:36 +00:00
|
|
|
|
|
|
|
|
|
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
|
2001-07-06 04:58:11 +00:00
|
|
|
|
Lesser General Public License for more details.
|
1997-02-15 04:31:36 +00:00
|
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-09 23:18:22 +00:00
|
|
|
|
License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
|
<https://www.gnu.org/licenses/>. */
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
#include <hurd.h>
|
|
|
|
|
#include <hurd/term.h>
|
|
|
|
|
#include <hurd/fd.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
#include <limits.h>
|
2020-11-14 23:35:35 +00:00
|
|
|
|
#include <lock-intern.h> /* For `struct mutex'. */
|
1995-02-18 01:27:10 +00:00
|
|
|
|
#include "set-hooks.h"
|
|
|
|
|
#include "hurdmalloc.h" /* XXX */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
struct mutex _hurd_dtable_lock = MUTEX_INITIALIZER; /* XXX ld bug; must init */
|
|
|
|
|
struct hurd_fd **_hurd_dtable;
|
|
|
|
|
int _hurd_dtablesize;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DEFINE_HOOK (_hurd_fd_subinit, (void));
|
|
|
|
|
|
|
|
|
|
/* Initialize the file descriptor table at startup. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
init_dtable (void)
|
|
|
|
|
{
|
Mon Mar 20 03:19:23 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* stdio/vfscanf.c (%n): Use READ_IN - 1, so as not to count the
read-ahead character.
* hurd/dtable.c, hurd/getdport.c, hurd/hurd.h, hurd/hurdexec.c,
hurd/hurdinit.c, hurd/hurdprio.c, hurd/hurdsock.c,
hurd/ports-get.c, hurd/ports-set.c, hurd/setauth.c,
hurd/setuids.c, sysdeps/mach/hurd/i386/trampoline.c:
Get anal with unsigned to pacify compiler.
1995-03-20 08:21:38 +00:00
|
|
|
|
int i;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
__mutex_init (&_hurd_dtable_lock);
|
|
|
|
|
|
|
|
|
|
/* The initial size of the descriptor table is that of the passed-in
|
|
|
|
|
table. It will be expanded as necessary up to _hurd_dtable_rlimit. */
|
|
|
|
|
_hurd_dtablesize = _hurd_init_dtablesize;
|
|
|
|
|
|
|
|
|
|
/* Allocate the vector of pointers. */
|
|
|
|
|
_hurd_dtable = malloc (_hurd_dtablesize * sizeof (*_hurd_dtable));
|
|
|
|
|
if (_hurd_dtablesize != 0 && _hurd_dtable == NULL)
|
|
|
|
|
__libc_fatal ("hurd: Can't allocate file descriptor table\n");
|
|
|
|
|
|
|
|
|
|
/* Initialize the descriptor table. */
|
Mon Mar 20 03:19:23 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* stdio/vfscanf.c (%n): Use READ_IN - 1, so as not to count the
read-ahead character.
* hurd/dtable.c, hurd/getdport.c, hurd/hurd.h, hurd/hurdexec.c,
hurd/hurdinit.c, hurd/hurdprio.c, hurd/hurdsock.c,
hurd/ports-get.c, hurd/ports-set.c, hurd/setauth.c,
hurd/setuids.c, sysdeps/mach/hurd/i386/trampoline.c:
Get anal with unsigned to pacify compiler.
1995-03-20 08:21:38 +00:00
|
|
|
|
for (i = 0; (unsigned int) i < _hurd_init_dtablesize; ++i)
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
|
|
|
|
if (_hurd_init_dtable[i] == MACH_PORT_NULL)
|
|
|
|
|
/* An unused descriptor is marked by a null pointer. */
|
|
|
|
|
_hurd_dtable[i] = NULL;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Allocate a new file descriptor structure. */
|
|
|
|
|
struct hurd_fd *new = malloc (sizeof (struct hurd_fd));
|
|
|
|
|
if (new == NULL)
|
|
|
|
|
__libc_fatal ("hurd: Can't allocate initial file descriptors\n");
|
|
|
|
|
|
|
|
|
|
/* Initialize the port cells. */
|
|
|
|
|
_hurd_port_init (&new->port, MACH_PORT_NULL);
|
|
|
|
|
_hurd_port_init (&new->ctty, MACH_PORT_NULL);
|
|
|
|
|
|
|
|
|
|
/* Install the port in the descriptor.
|
|
|
|
|
This sets up all the ctty magic. */
|
|
|
|
|
_hurd_port2fd (new, _hurd_init_dtable[i], 0);
|
|
|
|
|
|
|
|
|
|
_hurd_dtable[i] = new;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Clear out the initial descriptor table.
|
|
|
|
|
Everything must use _hurd_dtable now. */
|
|
|
|
|
__vm_deallocate (__mach_task_self (),
|
|
|
|
|
(vm_address_t) _hurd_init_dtable,
|
|
|
|
|
_hurd_init_dtablesize * sizeof (_hurd_init_dtable[0]));
|
|
|
|
|
_hurd_init_dtable = NULL;
|
|
|
|
|
_hurd_init_dtablesize = 0;
|
|
|
|
|
|
|
|
|
|
/* Initialize the remaining empty slots in the table. */
|
|
|
|
|
for (; i < _hurd_dtablesize; ++i)
|
|
|
|
|
_hurd_dtable[i] = NULL;
|
|
|
|
|
|
|
|
|
|
/* Run things that want to run after the file descriptor table
|
|
|
|
|
is initialized. */
|
|
|
|
|
RUN_HOOK (_hurd_fd_subinit, ());
|
|
|
|
|
|
|
|
|
|
(void) &init_dtable; /* Avoid "defined but not used" warning. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
text_set_element (_hurd_subinit, init_dtable);
|
|
|
|
|
|
|
|
|
|
/* XXX when the linker supports it, the following functions should all be
|
|
|
|
|
elsewhere and just have text_set_elements here. */
|
|
|
|
|
|
|
|
|
|
/* Called by `getdport' to do its work. */
|
|
|
|
|
|
|
|
|
|
static file_t
|
|
|
|
|
get_dtable_port (int fd)
|
|
|
|
|
{
|
1999-11-18 Roland McGrath <roland@baalperazim.frob.com>
* hurd/hurdsig.c (_hurdsig_init): If __hurd_threadvar_stack_mask is
nonzero, use cthread_fork to create the signal thread.
* hurd/msgportdemux.c (_hurd_msgport_receive): Initialize
_hurd_msgport_thread here (to self).
* sysdeps/mach/hurd/fork.c (__fork): When __hurd_sigthread_stack_end
is zero, instead compute child signal thread's starting SP from parent
signal thread's current SP and the threadvar_stack variables.
* hurd/Versions (GLIBC_2.1.3): Add cthread_fork, cthread_detach.
These are now referenced weakly by _hurdsig_init.
* hurd/report-wait.c (_S_msg_report_wait): Fix typo:
&_hurd_itimer_thread not &_hurd_msgport_thread.
1999-10-01 Roland McGrath <roland@baalperazim.frob.com>
* hurd/hurdfchdir.c (_hurd_change_directory_port_from_fd): Rewrite
without HURD_DPORT_USE to clean up warnings.
* hurd/dtable.c (get_dtable_port): Likewise.
* hurd/hurdioctl.c (rectty_dtable): Renamed to install_ctty.
(install_ctty): Do the changing of the cttyid port cell here, inside
the critical section while we holding the dtable lock.
(_hurd_setcttyid, tiocsctty, tiocnotty): Use that instead of changing
the port cell and calling rectty_dtable.
(_hurd_locked_install_cttyid): New function, split out of install_ctty.
(install_ctty): Use it inside a critical section, with the lock held.
* sysdeps/mach/hurd/setsid.c (__setsid): Use
_hurd_locked_install_cttyid to effect the cttyid and dtable changes
after proc_setsid, having held the dtable lock throughout.
* hurd/dtable.c (ctty_new_pgrp): With the dtable lock held, check the
cttyid port for null and bail out early if so. The dtable lock
serializes us after any cttyid change and its associated dtable update.
1999-12-03 05:01:23 +00:00
|
|
|
|
struct hurd_fd *d = _hurd_fd_get (fd);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
file_t dport;
|
1999-11-18 Roland McGrath <roland@baalperazim.frob.com>
* hurd/hurdsig.c (_hurdsig_init): If __hurd_threadvar_stack_mask is
nonzero, use cthread_fork to create the signal thread.
* hurd/msgportdemux.c (_hurd_msgport_receive): Initialize
_hurd_msgport_thread here (to self).
* sysdeps/mach/hurd/fork.c (__fork): When __hurd_sigthread_stack_end
is zero, instead compute child signal thread's starting SP from parent
signal thread's current SP and the threadvar_stack variables.
* hurd/Versions (GLIBC_2.1.3): Add cthread_fork, cthread_detach.
These are now referenced weakly by _hurdsig_init.
* hurd/report-wait.c (_S_msg_report_wait): Fix typo:
&_hurd_itimer_thread not &_hurd_msgport_thread.
1999-10-01 Roland McGrath <roland@baalperazim.frob.com>
* hurd/hurdfchdir.c (_hurd_change_directory_port_from_fd): Rewrite
without HURD_DPORT_USE to clean up warnings.
* hurd/dtable.c (get_dtable_port): Likewise.
* hurd/hurdioctl.c (rectty_dtable): Renamed to install_ctty.
(install_ctty): Do the changing of the cttyid port cell here, inside
the critical section while we holding the dtable lock.
(_hurd_setcttyid, tiocsctty, tiocnotty): Use that instead of changing
the port cell and calling rectty_dtable.
(_hurd_locked_install_cttyid): New function, split out of install_ctty.
(install_ctty): Use it inside a critical section, with the lock held.
* sysdeps/mach/hurd/setsid.c (__setsid): Use
_hurd_locked_install_cttyid to effect the cttyid and dtable changes
after proc_setsid, having held the dtable lock throughout.
* hurd/dtable.c (ctty_new_pgrp): With the dtable lock held, check the
cttyid port for null and bail out early if so. The dtable lock
serializes us after any cttyid change and its associated dtable update.
1999-12-03 05:01:23 +00:00
|
|
|
|
|
|
|
|
|
if (!d)
|
|
|
|
|
return __hurd_fail (EBADF), MACH_PORT_NULL;
|
|
|
|
|
|
|
|
|
|
HURD_CRITICAL_BEGIN;
|
|
|
|
|
|
|
|
|
|
dport = HURD_PORT_USE (&d->port,
|
|
|
|
|
({
|
|
|
|
|
error_t err;
|
|
|
|
|
mach_port_t outport;
|
|
|
|
|
err = __mach_port_mod_refs (__mach_task_self (),
|
|
|
|
|
port,
|
|
|
|
|
MACH_PORT_RIGHT_SEND,
|
|
|
|
|
1);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
errno = err;
|
|
|
|
|
outport = MACH_PORT_NULL;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
outport = port;
|
|
|
|
|
outport;
|
|
|
|
|
}));
|
|
|
|
|
|
|
|
|
|
HURD_CRITICAL_END;
|
|
|
|
|
|
|
|
|
|
return dport;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
file_t (*_hurd_getdport_fn) (int fd) = get_dtable_port;
|
|
|
|
|
|
|
|
|
|
#include <hurd/signal.h>
|
|
|
|
|
|
|
|
|
|
/* We are in the child fork; the dtable lock is still held.
|
|
|
|
|
The parent has inserted send rights for all the normal io ports,
|
|
|
|
|
but we must recover ctty-special ports for ourselves. */
|
|
|
|
|
static error_t
|
|
|
|
|
fork_child_dtable (void)
|
|
|
|
|
{
|
|
|
|
|
error_t err;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
err = 0;
|
|
|
|
|
|
|
|
|
|
for (i = 0; !err && i < _hurd_dtablesize; ++i)
|
|
|
|
|
{
|
|
|
|
|
struct hurd_fd *d = _hurd_dtable[i];
|
|
|
|
|
if (d == NULL)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* No other thread is using the send rights in the child task. */
|
|
|
|
|
d->port.users = d->ctty.users = NULL;
|
|
|
|
|
|
|
|
|
|
if (d->ctty.port != MACH_PORT_NULL)
|
|
|
|
|
{
|
|
|
|
|
/* There was a ctty-special port in the parent.
|
|
|
|
|
We need to get one for ourselves too. */
|
|
|
|
|
__mach_port_deallocate (__mach_task_self (), d->ctty.port);
|
|
|
|
|
err = __term_open_ctty (d->port.port, _hurd_pid, _hurd_pgrp,
|
|
|
|
|
&d->ctty.port);
|
|
|
|
|
if (err)
|
|
|
|
|
d->ctty.port = MACH_PORT_NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* XXX for each fd with a cntlmap, reauth and re-map_cntl. */
|
|
|
|
|
}
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
(void) &fork_child_dtable; /* Avoid "defined but not used" warning. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
data_set_element (_hurd_fork_locks, _hurd_dtable_lock); /* XXX ld bug: bss */
|
|
|
|
|
text_set_element (_hurd_fork_child_hook, fork_child_dtable);
|
|
|
|
|
|
|
|
|
|
/* Called when our process group has changed. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ctty_new_pgrp (void)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
1996-05-04 09:46:57 +00:00
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
|
HURD_CRITICAL_BEGIN;
|
|
|
|
|
__mutex_lock (&_hurd_dtable_lock);
|
|
|
|
|
|
1999-11-18 Roland McGrath <roland@baalperazim.frob.com>
* hurd/hurdsig.c (_hurdsig_init): If __hurd_threadvar_stack_mask is
nonzero, use cthread_fork to create the signal thread.
* hurd/msgportdemux.c (_hurd_msgport_receive): Initialize
_hurd_msgport_thread here (to self).
* sysdeps/mach/hurd/fork.c (__fork): When __hurd_sigthread_stack_end
is zero, instead compute child signal thread's starting SP from parent
signal thread's current SP and the threadvar_stack variables.
* hurd/Versions (GLIBC_2.1.3): Add cthread_fork, cthread_detach.
These are now referenced weakly by _hurdsig_init.
* hurd/report-wait.c (_S_msg_report_wait): Fix typo:
&_hurd_itimer_thread not &_hurd_msgport_thread.
1999-10-01 Roland McGrath <roland@baalperazim.frob.com>
* hurd/hurdfchdir.c (_hurd_change_directory_port_from_fd): Rewrite
without HURD_DPORT_USE to clean up warnings.
* hurd/dtable.c (get_dtable_port): Likewise.
* hurd/hurdioctl.c (rectty_dtable): Renamed to install_ctty.
(install_ctty): Do the changing of the cttyid port cell here, inside
the critical section while we holding the dtable lock.
(_hurd_setcttyid, tiocsctty, tiocnotty): Use that instead of changing
the port cell and calling rectty_dtable.
(_hurd_locked_install_cttyid): New function, split out of install_ctty.
(install_ctty): Use it inside a critical section, with the lock held.
* sysdeps/mach/hurd/setsid.c (__setsid): Use
_hurd_locked_install_cttyid to effect the cttyid and dtable changes
after proc_setsid, having held the dtable lock throughout.
* hurd/dtable.c (ctty_new_pgrp): With the dtable lock held, check the
cttyid port for null and bail out early if so. The dtable lock
serializes us after any cttyid change and its associated dtable update.
1999-12-03 05:01:23 +00:00
|
|
|
|
if (__USEPORT (CTTYID, port == MACH_PORT_NULL))
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
1999-11-18 Roland McGrath <roland@baalperazim.frob.com>
* hurd/hurdsig.c (_hurdsig_init): If __hurd_threadvar_stack_mask is
nonzero, use cthread_fork to create the signal thread.
* hurd/msgportdemux.c (_hurd_msgport_receive): Initialize
_hurd_msgport_thread here (to self).
* sysdeps/mach/hurd/fork.c (__fork): When __hurd_sigthread_stack_end
is zero, instead compute child signal thread's starting SP from parent
signal thread's current SP and the threadvar_stack variables.
* hurd/Versions (GLIBC_2.1.3): Add cthread_fork, cthread_detach.
These are now referenced weakly by _hurdsig_init.
* hurd/report-wait.c (_S_msg_report_wait): Fix typo:
&_hurd_itimer_thread not &_hurd_msgport_thread.
1999-10-01 Roland McGrath <roland@baalperazim.frob.com>
* hurd/hurdfchdir.c (_hurd_change_directory_port_from_fd): Rewrite
without HURD_DPORT_USE to clean up warnings.
* hurd/dtable.c (get_dtable_port): Likewise.
* hurd/hurdioctl.c (rectty_dtable): Renamed to install_ctty.
(install_ctty): Do the changing of the cttyid port cell here, inside
the critical section while we holding the dtable lock.
(_hurd_setcttyid, tiocsctty, tiocnotty): Use that instead of changing
the port cell and calling rectty_dtable.
(_hurd_locked_install_cttyid): New function, split out of install_ctty.
(install_ctty): Use it inside a critical section, with the lock held.
* sysdeps/mach/hurd/setsid.c (__setsid): Use
_hurd_locked_install_cttyid to effect the cttyid and dtable changes
after proc_setsid, having held the dtable lock throughout.
* hurd/dtable.c (ctty_new_pgrp): With the dtable lock held, check the
cttyid port for null and bail out early if so. The dtable lock
serializes us after any cttyid change and its associated dtable update.
1999-12-03 05:01:23 +00:00
|
|
|
|
/* We have no controlling terminal. If we haven't had one recently,
|
|
|
|
|
but our pgrp is being pointlessly diddled anyway, then we will
|
|
|
|
|
have nothing to do in the loop below because no fd will have a
|
|
|
|
|
ctty port at all.
|
|
|
|
|
|
|
|
|
|
More likely, a setsid call is responsible both for the change
|
|
|
|
|
in pgrp and for clearing the cttyid port. In that case, setsid
|
|
|
|
|
held the dtable lock while updating the dtable to clear all the
|
|
|
|
|
ctty ports, and ergo must have finished doing so before we run here.
|
|
|
|
|
So we can be sure, again, that the loop below has no work to do. */
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
1999-11-18 Roland McGrath <roland@baalperazim.frob.com>
* hurd/hurdsig.c (_hurdsig_init): If __hurd_threadvar_stack_mask is
nonzero, use cthread_fork to create the signal thread.
* hurd/msgportdemux.c (_hurd_msgport_receive): Initialize
_hurd_msgport_thread here (to self).
* sysdeps/mach/hurd/fork.c (__fork): When __hurd_sigthread_stack_end
is zero, instead compute child signal thread's starting SP from parent
signal thread's current SP and the threadvar_stack variables.
* hurd/Versions (GLIBC_2.1.3): Add cthread_fork, cthread_detach.
These are now referenced weakly by _hurdsig_init.
* hurd/report-wait.c (_S_msg_report_wait): Fix typo:
&_hurd_itimer_thread not &_hurd_msgport_thread.
1999-10-01 Roland McGrath <roland@baalperazim.frob.com>
* hurd/hurdfchdir.c (_hurd_change_directory_port_from_fd): Rewrite
without HURD_DPORT_USE to clean up warnings.
* hurd/dtable.c (get_dtable_port): Likewise.
* hurd/hurdioctl.c (rectty_dtable): Renamed to install_ctty.
(install_ctty): Do the changing of the cttyid port cell here, inside
the critical section while we holding the dtable lock.
(_hurd_setcttyid, tiocsctty, tiocnotty): Use that instead of changing
the port cell and calling rectty_dtable.
(_hurd_locked_install_cttyid): New function, split out of install_ctty.
(install_ctty): Use it inside a critical section, with the lock held.
* sysdeps/mach/hurd/setsid.c (__setsid): Use
_hurd_locked_install_cttyid to effect the cttyid and dtable changes
after proc_setsid, having held the dtable lock throughout.
* hurd/dtable.c (ctty_new_pgrp): With the dtable lock held, check the
cttyid port for null and bail out early if so. The dtable lock
serializes us after any cttyid change and its associated dtable update.
1999-12-03 05:01:23 +00:00
|
|
|
|
else
|
|
|
|
|
for (i = 0; i < _hurd_dtablesize; ++i)
|
|
|
|
|
{
|
|
|
|
|
struct hurd_fd *const d = _hurd_dtable[i];
|
|
|
|
|
struct hurd_userlink ulink, ctty_ulink;
|
|
|
|
|
io_t port, ctty;
|
|
|
|
|
|
|
|
|
|
if (d == NULL)
|
|
|
|
|
/* Nothing to do for an unused descriptor cell. */
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
port = _hurd_port_get (&d->port, &ulink);
|
|
|
|
|
ctty = _hurd_port_get (&d->ctty, &ctty_ulink);
|
|
|
|
|
|
|
|
|
|
if (ctty != MACH_PORT_NULL)
|
|
|
|
|
{
|
|
|
|
|
/* This fd has a ctty-special port. We need a new one, to tell
|
|
|
|
|
the io server of our different process group. */
|
|
|
|
|
io_t new;
|
|
|
|
|
if (__term_open_ctty (port, _hurd_pid, _hurd_pgrp, &new))
|
|
|
|
|
new = MACH_PORT_NULL;
|
|
|
|
|
_hurd_port_set (&d->ctty, new);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
_hurd_port_free (&d->port, &ulink, port);
|
|
|
|
|
_hurd_port_free (&d->ctty, &ctty_ulink, ctty);
|
|
|
|
|
}
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
__mutex_unlock (&_hurd_dtable_lock);
|
|
|
|
|
HURD_CRITICAL_END;
|
|
|
|
|
|
|
|
|
|
(void) &ctty_new_pgrp; /* Avoid "defined but not used" warning. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
text_set_element (_hurd_pgrp_changed_hook, ctty_new_pgrp);
|
|
|
|
|
|
|
|
|
|
/* Called to reauthenticate the dtable when the auth port changes. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
reauth_dtable (void)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
HURD_CRITICAL_BEGIN;
|
|
|
|
|
__mutex_lock (&_hurd_dtable_lock);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < _hurd_dtablesize; ++i)
|
|
|
|
|
{
|
|
|
|
|
struct hurd_fd *const d = _hurd_dtable[i];
|
|
|
|
|
mach_port_t new, newctty, ref;
|
1996-05-04 09:46:57 +00:00
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
|
if (d == NULL)
|
|
|
|
|
/* Nothing to do for an unused descriptor cell. */
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
ref = __mach_reply_port ();
|
|
|
|
|
|
|
|
|
|
/* Take the descriptor cell's lock. */
|
|
|
|
|
__spin_lock (&d->port.lock);
|
1996-05-04 09:46:57 +00:00
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
|
/* Reauthenticate the descriptor's port. */
|
Break some lines before not after operators.
The GNU Coding Standards specify that line breaks in expressions
should go before an operator, not after one. This patch fixes various
code to do this. It only changes code that appears to be mostly
following GNU style anyway, not files and directories with
substantially different formatting. It is not exhaustive even for
files using GNU style (for example, changes to sysdeps files are
deferred for subsequent cleanups). Some files changed are shared with
gnulib, but most are specific to glibc. Changes were made manually,
with places to change found by grep (so some cases, e.g. where the
operator was followed by a comment at end of line, are particularly
liable to have been missed by grep, but I did include cases where the
operator was followed by backslash-newline).
This patch generally does not attempt to address other coding style
issues in the expressions changed (for example, missing spaces before
'(', or lack of parentheses to ensure indentation of continuation
lines properly reflects operator precedence).
Tested for x86_64, and with build-many-glibcs.py.
* benchtests/bench-memmem.c (simple_memmem): Break lines before
rather than after operators.
* benchtests/bench-skeleton.c (TIMESPEC_AFTER): Likewise.
* crypt/md5.c (md5_finish_ctx): Likewise.
* crypt/sha256.c (__sha256_finish_ctx): Likewise.
* crypt/sha512.c (__sha512_finish_ctx): Likewise.
* elf/cache.c (load_aux_cache): Likewise.
* elf/dl-load.c (open_verify): Likewise.
* elf/get-dynamic-info.h (elf_get_dynamic_info): Likewise.
* elf/readelflib.c (process_elf_file): Likewise.
* elf/rtld.c (dl_main): Likewise.
* elf/sprof.c (generate_call_graph): Likewise.
* hurd/ctty-input.c (_hurd_ctty_input): Likewise.
* hurd/ctty-output.c (_hurd_ctty_output): Likewise.
* hurd/dtable.c (reauth_dtable): Likewise.
* hurd/getdport.c (__getdport): Likewise.
* hurd/hurd/signal.h (_hurd_interrupted_rpc_timeout): Likewise.
* hurd/hurd/sigpreempt.h (HURD_PREEMPT_SIGNAL_P): Likewise.
* hurd/hurdfault.c (_hurdsig_fault_catch_exception_raise):
Likewise.
* hurd/hurdioctl.c (fioctl): Likewise.
* hurd/hurdselect.c (_hurd_select): Likewise.
* hurd/hurdsig.c (_hurdsig_abort_rpcs): Likewise.
(STOPSIGS): Likewise.
* hurd/hurdstartup.c (_hurd_startup): Likewise.
* hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): Likewise.
* hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise.
* hurd/msgportdemux.c (msgport_server): Likewise.
* hurd/setauth.c (_hurd_setauth): Likewise.
* include/features.h (__GLIBC_USE_DEPRECATED_SCANF): Likewise.
* libio/libioP.h [IO_DEBUG] (CHECK_FILE): Likewise.
* locale/programs/ld-ctype.c (set_class_defaults): Likewise.
* localedata/tests-mbwc/tst_swscanf.c (tst_swscanf): Likewise.
* login/tst-utmp.c (do_check): Likewise.
(simulate_login): Likewise.
* mach/lowlevellock.h (lll_lock): Likewise.
(lll_trylock): Likewise.
* math/test-fenv.c (ALL_EXC): Likewise.
* math/test-fenvinline.c (ALL_EXC): Likewise.
* misc/sys/cdefs.h (__attribute_deprecated_msg__): Likewise.
* nis/nis_call.c (__do_niscall3): Likewise.
* nis/nis_callback.c (cb_prog_1): Likewise.
* nis/nis_defaults.c (searchaccess): Likewise.
* nis/nis_findserv.c (__nis_findfastest_with_timeout): Likewise.
* nis/nis_ismember.c (internal_ismember): Likewise.
* nis/nis_local_names.c (nis_local_principal): Likewise.
* nis/nss_nis/nis-rpc.c (_nss_nis_getrpcbyname_r): Likewise.
* nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_getnetgrent_r):
Likewise.
* nis/ypclnt.c (yp_match): Likewise.
(yp_first): Likewise.
(yp_next): Likewise.
(yp_master): Likewise.
(yp_order): Likewise.
* nscd/hstcache.c (cache_addhst): Likewise.
* nscd/initgrcache.c (addinitgroupsX): Likewise.
* nss/nss_compat/compat-pwd.c (copy_pwd_changes): Likewise.
(internal_getpwuid_r): Likewise.
* nss/nss_compat/compat-spwd.c (copy_spwd_changes): Likewise.
* posix/glob.h (__GLOB_FLAGS): Likewise.
* posix/regcomp.c (peek_token): Likewise.
(peek_token_bracket): Likewise.
(parse_expression): Likewise.
* posix/regexec.c (sift_states_iter_mb): Likewise.
(check_node_accept_bytes): Likewise.
* posix/tst-spawn3.c (do_test): Likewise.
* posix/wordexp-test.c (testit): Likewise.
* posix/wordexp.c (parse_tilde): Likewise.
(exec_comm): Likewise.
* posix/wordexp.h (__WRDE_FLAGS): Likewise.
* resource/vtimes.c (TIMEVAL_TO_VTIMES): Likewise.
* setjmp/sigjmp.c (__sigjmp_save): Likewise.
* stdio-common/printf_fp.c (__printf_fp_l): Likewise.
* stdio-common/tst-fileno.c (do_test): Likewise.
* stdio-common/vfprintf-internal.c (vfprintf): Likewise.
* stdlib/strfmon_l.c (__vstrfmon_l_internal): Likewise.
* stdlib/strtod_l.c (round_and_return): Likewise.
(____STRTOF_INTERNAL): Likewise.
* stdlib/tst-strfrom.h (TEST_STRFROM): Likewise.
* string/strcspn.c (STRCSPN): Likewise.
* string/test-memmem.c (simple_memmem): Likewise.
* termios/tcsetattr.c (tcsetattr): Likewise.
* time/alt_digit.c (_nl_parse_alt_digit): Likewise.
* time/asctime.c (asctime_internal): Likewise.
* time/strptime_l.c (__strptime_internal): Likewise.
* time/sys/time.h (timercmp): Likewise.
* time/tzfile.c (__tzfile_compute): Likewise.
2019-02-22 01:32:36 +00:00
|
|
|
|
if (d->port.port != MACH_PORT_NULL
|
|
|
|
|
&& ! __io_reauthenticate (d->port.port,
|
|
|
|
|
ref, MACH_MSG_TYPE_MAKE_SEND)
|
|
|
|
|
&& ! __USEPORT (AUTH, __auth_user_authenticate
|
|
|
|
|
(port,
|
|
|
|
|
ref, MACH_MSG_TYPE_MAKE_SEND,
|
|
|
|
|
&new)))
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
|
|
|
|
/* Replace the port in the descriptor cell
|
|
|
|
|
with the newly reauthenticated port. */
|
|
|
|
|
|
Break some lines before not after operators.
The GNU Coding Standards specify that line breaks in expressions
should go before an operator, not after one. This patch fixes various
code to do this. It only changes code that appears to be mostly
following GNU style anyway, not files and directories with
substantially different formatting. It is not exhaustive even for
files using GNU style (for example, changes to sysdeps files are
deferred for subsequent cleanups). Some files changed are shared with
gnulib, but most are specific to glibc. Changes were made manually,
with places to change found by grep (so some cases, e.g. where the
operator was followed by a comment at end of line, are particularly
liable to have been missed by grep, but I did include cases where the
operator was followed by backslash-newline).
This patch generally does not attempt to address other coding style
issues in the expressions changed (for example, missing spaces before
'(', or lack of parentheses to ensure indentation of continuation
lines properly reflects operator precedence).
Tested for x86_64, and with build-many-glibcs.py.
* benchtests/bench-memmem.c (simple_memmem): Break lines before
rather than after operators.
* benchtests/bench-skeleton.c (TIMESPEC_AFTER): Likewise.
* crypt/md5.c (md5_finish_ctx): Likewise.
* crypt/sha256.c (__sha256_finish_ctx): Likewise.
* crypt/sha512.c (__sha512_finish_ctx): Likewise.
* elf/cache.c (load_aux_cache): Likewise.
* elf/dl-load.c (open_verify): Likewise.
* elf/get-dynamic-info.h (elf_get_dynamic_info): Likewise.
* elf/readelflib.c (process_elf_file): Likewise.
* elf/rtld.c (dl_main): Likewise.
* elf/sprof.c (generate_call_graph): Likewise.
* hurd/ctty-input.c (_hurd_ctty_input): Likewise.
* hurd/ctty-output.c (_hurd_ctty_output): Likewise.
* hurd/dtable.c (reauth_dtable): Likewise.
* hurd/getdport.c (__getdport): Likewise.
* hurd/hurd/signal.h (_hurd_interrupted_rpc_timeout): Likewise.
* hurd/hurd/sigpreempt.h (HURD_PREEMPT_SIGNAL_P): Likewise.
* hurd/hurdfault.c (_hurdsig_fault_catch_exception_raise):
Likewise.
* hurd/hurdioctl.c (fioctl): Likewise.
* hurd/hurdselect.c (_hurd_select): Likewise.
* hurd/hurdsig.c (_hurdsig_abort_rpcs): Likewise.
(STOPSIGS): Likewise.
* hurd/hurdstartup.c (_hurd_startup): Likewise.
* hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): Likewise.
* hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise.
* hurd/msgportdemux.c (msgport_server): Likewise.
* hurd/setauth.c (_hurd_setauth): Likewise.
* include/features.h (__GLIBC_USE_DEPRECATED_SCANF): Likewise.
* libio/libioP.h [IO_DEBUG] (CHECK_FILE): Likewise.
* locale/programs/ld-ctype.c (set_class_defaults): Likewise.
* localedata/tests-mbwc/tst_swscanf.c (tst_swscanf): Likewise.
* login/tst-utmp.c (do_check): Likewise.
(simulate_login): Likewise.
* mach/lowlevellock.h (lll_lock): Likewise.
(lll_trylock): Likewise.
* math/test-fenv.c (ALL_EXC): Likewise.
* math/test-fenvinline.c (ALL_EXC): Likewise.
* misc/sys/cdefs.h (__attribute_deprecated_msg__): Likewise.
* nis/nis_call.c (__do_niscall3): Likewise.
* nis/nis_callback.c (cb_prog_1): Likewise.
* nis/nis_defaults.c (searchaccess): Likewise.
* nis/nis_findserv.c (__nis_findfastest_with_timeout): Likewise.
* nis/nis_ismember.c (internal_ismember): Likewise.
* nis/nis_local_names.c (nis_local_principal): Likewise.
* nis/nss_nis/nis-rpc.c (_nss_nis_getrpcbyname_r): Likewise.
* nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_getnetgrent_r):
Likewise.
* nis/ypclnt.c (yp_match): Likewise.
(yp_first): Likewise.
(yp_next): Likewise.
(yp_master): Likewise.
(yp_order): Likewise.
* nscd/hstcache.c (cache_addhst): Likewise.
* nscd/initgrcache.c (addinitgroupsX): Likewise.
* nss/nss_compat/compat-pwd.c (copy_pwd_changes): Likewise.
(internal_getpwuid_r): Likewise.
* nss/nss_compat/compat-spwd.c (copy_spwd_changes): Likewise.
* posix/glob.h (__GLOB_FLAGS): Likewise.
* posix/regcomp.c (peek_token): Likewise.
(peek_token_bracket): Likewise.
(parse_expression): Likewise.
* posix/regexec.c (sift_states_iter_mb): Likewise.
(check_node_accept_bytes): Likewise.
* posix/tst-spawn3.c (do_test): Likewise.
* posix/wordexp-test.c (testit): Likewise.
* posix/wordexp.c (parse_tilde): Likewise.
(exec_comm): Likewise.
* posix/wordexp.h (__WRDE_FLAGS): Likewise.
* resource/vtimes.c (TIMEVAL_TO_VTIMES): Likewise.
* setjmp/sigjmp.c (__sigjmp_save): Likewise.
* stdio-common/printf_fp.c (__printf_fp_l): Likewise.
* stdio-common/tst-fileno.c (do_test): Likewise.
* stdio-common/vfprintf-internal.c (vfprintf): Likewise.
* stdlib/strfmon_l.c (__vstrfmon_l_internal): Likewise.
* stdlib/strtod_l.c (round_and_return): Likewise.
(____STRTOF_INTERNAL): Likewise.
* stdlib/tst-strfrom.h (TEST_STRFROM): Likewise.
* string/strcspn.c (STRCSPN): Likewise.
* string/test-memmem.c (simple_memmem): Likewise.
* termios/tcsetattr.c (tcsetattr): Likewise.
* time/alt_digit.c (_nl_parse_alt_digit): Likewise.
* time/asctime.c (asctime_internal): Likewise.
* time/strptime_l.c (__strptime_internal): Likewise.
* time/sys/time.h (timercmp): Likewise.
* time/tzfile.c (__tzfile_compute): Likewise.
2019-02-22 01:32:36 +00:00
|
|
|
|
if (d->ctty.port != MACH_PORT_NULL
|
|
|
|
|
&& ! __io_reauthenticate (d->ctty.port,
|
|
|
|
|
ref, MACH_MSG_TYPE_MAKE_SEND)
|
|
|
|
|
&& ! __USEPORT (AUTH, __auth_user_authenticate
|
|
|
|
|
(port,
|
|
|
|
|
ref, MACH_MSG_TYPE_MAKE_SEND,
|
|
|
|
|
&newctty)))
|
1995-02-18 01:27:10 +00:00
|
|
|
|
_hurd_port_set (&d->ctty, newctty);
|
|
|
|
|
|
|
|
|
|
_hurd_port_locked_set (&d->port, new);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
/* Lost. Leave this descriptor cell alone. */
|
|
|
|
|
__spin_unlock (&d->port.lock);
|
|
|
|
|
|
|
|
|
|
__mach_port_destroy (__mach_task_self (), ref);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
__mutex_unlock (&_hurd_dtable_lock);
|
|
|
|
|
HURD_CRITICAL_END;
|
|
|
|
|
|
|
|
|
|
(void) &reauth_dtable; /* Avoid "defined but not used" warning. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
text_set_element (_hurd_reauth_hook, reauth_dtable);
|