mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-15 04:20:28 +08:00
a04549c194
This patch makes further coding style fixes where code was breaking lines after an operator, contrary to the GNU Coding Standards. As with the previous patch, it is limited to files following a reasonable approximation to GNU style already, and is not exhaustive; more such issues remain to be fixed. Tested for x86_64, and with build-many-glibcs.py. * dirent/dirent.h [!_DIRENT_HAVE_D_NAMLEN && _DIRENT_HAVE_D_RECLEN] (_D_ALLOC_NAMLEN): Break lines before rather than after operators. * elf/cache.c (print_cache): Likewise. * gshadow/fgetsgent_r.c (__fgetsgent_r): Likewise. * htl/pt-getattr.c (__pthread_getattr_np): Likewise. * hurd/hurdinit.c (_hurd_setproc): Likewise. * hurd/hurdkill.c (_hurd_sig_post): Likewise. * hurd/hurdlookup.c (__file_name_lookup_under): Likewise. * hurd/hurdsig.c (_hurd_internal_post_signal): Likewise. (reauth_proc): Likewise. * hurd/lookup-at.c (__file_name_lookup_at): Likewise. (__file_name_split_at): Likewise. (__directory_name_split_at): Likewise. * hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise. * hurd/port2fd.c (_hurd_port2fd): Likewise. * iconv/gconv_dl.c (do_print): Likewise. * inet/netinet/in.h (struct sockaddr_in): Likewise. * libio/wstrops.c (_IO_wstr_seekoff): Likewise. * locale/setlocale.c (new_composite_name): Likewise. * malloc/memusagestat.c (main): Likewise. * misc/fstab.c (fstab_convert): Likewise. * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt): Likewise. * nss/nss_compat/compat-grp.c (getgrent_next_nss): Likewise. (getgrent_next_file): Likewise. (internal_getgrnam_r): Likewise. (internal_getgrgid_r): Likewise. * nss/nss_compat/compat-initgroups.c (getgrent_next_nss): Likewise. (internal_getgrent_r): Likewise. * nss/nss_compat/compat-pwd.c (getpwent_next_nss_netgr): Likewise. (getpwent_next_nss): Likewise. (getpwent_next_file): Likewise. (internal_getpwnam_r): Likewise. (internal_getpwuid_r): Likewise. * nss/nss_compat/compat-spwd.c (getspent_next_nss_netgr): Likewise. (getspent_next_nss): Likewise. (internal_getspnam_r): Likewise. * pwd/fgetpwent_r.c (__fgetpwent_r): Likewise. * shadow/fgetspent_r.c (__fgetspent_r): Likewise. * string/strchr.c (STRCHR): Likewise. * string/strchrnul.c (STRCHRNUL): Likewise. * sysdeps/aarch64/fpu/fpu_control.h (_FPU_FPCR_IEEE): Likewise. * sysdeps/aarch64/sfp-machine.h (_FP_CHOOSENAN): Likewise. * sysdeps/csky/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/generic/memcopy.h (PAGE_COPY_FWD_MAYBE): Likewise. * sysdeps/generic/symbol-hacks.h (__stack_chk_fail_local): Likewise. * sysdeps/gnu/netinet/ip_icmp.h (ICMP_INFOTYPE): Likewise. * sysdeps/gnu/updwtmp.c (TRANSFORM_UTMP_FILE_NAME): Likewise. * sysdeps/gnu/utmp_file.c (TRANSFORM_UTMP_FILE_NAME): Likewise. * sysdeps/hppa/jmpbuf-unwind.h (_JMPBUF_UNWINDS): Likewise. * sysdeps/mach/hurd/bits/stat.h (S_ISPARE): Likewise. * sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_start): Likewise. (open_file): Likewise. * sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c (pthread_mutexattr_setprotocol): Likewise. * sysdeps/mach/hurd/ioctl.c (__ioctl): Likewise. * sysdeps/mach/hurd/mmap.c (__mmap): Likewise. * sysdeps/mach/hurd/ptrace.c (ptrace): Likewise. * sysdeps/mach/hurd/spawni.c (__spawni): Likewise. * sysdeps/microblaze/dl-machine.h (elf_machine_type_class): Likewise. (elf_machine_rela): Likewise. * sysdeps/mips/mips32/sfp-machine.h (_FP_CHOOSENAN): Likewise. * sysdeps/mips/mips64/sfp-machine.h (_FP_CHOOSENAN): Likewise. * sysdeps/mips/sys/asm.h (multiple #if conditionals): Likewise. * sysdeps/posix/rename.c (rename): Likewise. * sysdeps/powerpc/novmx-sigjmp.c (__novmx__sigjmp_save): Likewise. * sysdeps/powerpc/sigjmp.c (__vmx__sigjmp_save): Likewise. * sysdeps/s390/fpu/fenv_libc.h (FPC_VALID_MASK): Likewise. * sysdeps/s390/utf8-utf16-z9.c (gconv_end): Likewise. * sysdeps/unix/grantpt.c (grantpt): Likewise. * sysdeps/unix/sysv/linux/a.out.h (N_TXTOFF): Likewise. * sysdeps/unix/sysv/linux/updwtmp.c (TRANSFORM_UTMP_FILE_NAME): Likewise. * sysdeps/unix/sysv/linux/utmp_file.c (TRANSFORM_UTMP_FILE_NAME): Likewise. * sysdeps/x86/cpu-features.c (get_common_indices): Likewise. * time/tzfile.c (__tzfile_compute): Likewise.
261 lines
6.6 KiB
C
261 lines
6.6 KiB
C
/* Copyright (C) 1998-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998.
|
|
|
|
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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <grp.h>
|
|
#include <limits.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/resource.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
#include <unistd.h>
|
|
|
|
#include "pty-private.h"
|
|
|
|
|
|
/* Return the result of ptsname_r in the buffer pointed to by PTS,
|
|
which should be of length BUF_LEN. If it is too long to fit in
|
|
this buffer, a sufficiently long buffer is allocated using malloc,
|
|
and returned in PTS. 0 is returned upon success, -1 otherwise. */
|
|
static int
|
|
pts_name (int fd, char **pts, size_t buf_len, struct stat64 *stp)
|
|
{
|
|
int rv;
|
|
char *buf = *pts;
|
|
|
|
for (;;)
|
|
{
|
|
char *new_buf;
|
|
|
|
if (buf_len)
|
|
{
|
|
rv = __ptsname_internal (fd, buf, buf_len, stp);
|
|
if (rv != 0)
|
|
{
|
|
if (rv == ENOTTY)
|
|
/* ptsname_r returns with ENOTTY to indicate
|
|
a descriptor not referring to a pty master.
|
|
For this condition, grantpt must return EINVAL. */
|
|
rv = EINVAL;
|
|
errno = rv; /* Not necessarily set by __ptsname_r. */
|
|
break;
|
|
}
|
|
|
|
if (memchr (buf, '\0', buf_len))
|
|
/* We succeeded and the returned name fit in the buffer. */
|
|
break;
|
|
|
|
/* Try again with a longer buffer. */
|
|
buf_len += buf_len; /* Double it */
|
|
}
|
|
else
|
|
/* No initial buffer; start out by mallocing one. */
|
|
buf_len = 128; /* First time guess. */
|
|
|
|
if (buf != *pts)
|
|
/* We've already malloced another buffer at least once. */
|
|
new_buf = (char *) realloc (buf, buf_len);
|
|
else
|
|
new_buf = (char *) malloc (buf_len);
|
|
if (! new_buf)
|
|
{
|
|
rv = -1;
|
|
__set_errno (ENOMEM);
|
|
break;
|
|
}
|
|
buf = new_buf;
|
|
}
|
|
|
|
if (rv == 0)
|
|
*pts = buf; /* Return buffer to the user. */
|
|
else if (buf != *pts)
|
|
free (buf); /* Free what we malloced when returning an error. */
|
|
|
|
return rv;
|
|
}
|
|
|
|
/* Change the ownership and access permission of the slave pseudo
|
|
terminal associated with the master pseudo terminal specified
|
|
by FD. */
|
|
int
|
|
grantpt (int fd)
|
|
{
|
|
int retval = -1;
|
|
#ifdef PATH_MAX
|
|
char _buf[PATH_MAX];
|
|
#else
|
|
char _buf[512];
|
|
#endif
|
|
char *buf = _buf;
|
|
struct stat64 st;
|
|
|
|
if (__glibc_unlikely (pts_name (fd, &buf, sizeof (_buf), &st)))
|
|
{
|
|
int save_errno = errno;
|
|
|
|
/* Check, if the file descriptor is valid. pts_name returns the
|
|
wrong errno number, so we cannot use that. */
|
|
if (__libc_fcntl (fd, F_GETFD) == -1 && errno == EBADF)
|
|
return -1;
|
|
|
|
/* If the filedescriptor is no TTY, grantpt has to set errno
|
|
to EINVAL. */
|
|
if (save_errno == ENOTTY)
|
|
__set_errno (EINVAL);
|
|
else
|
|
__set_errno (save_errno);
|
|
|
|
return -1;
|
|
}
|
|
|
|
/* Make sure that we own the device. */
|
|
uid_t uid = __getuid ();
|
|
if (st.st_uid != uid)
|
|
{
|
|
if (__chown (buf, uid, st.st_gid) < 0)
|
|
goto helper;
|
|
}
|
|
|
|
static int tty_gid = -1;
|
|
if (__glibc_unlikely (tty_gid == -1))
|
|
{
|
|
char *grtmpbuf;
|
|
struct group grbuf;
|
|
size_t grbuflen = __sysconf (_SC_GETGR_R_SIZE_MAX);
|
|
struct group *p;
|
|
|
|
/* Get the group ID of the special `tty' group. */
|
|
if (grbuflen == (size_t) -1L)
|
|
/* `sysconf' does not support _SC_GETGR_R_SIZE_MAX.
|
|
Try a moderate value. */
|
|
grbuflen = 1024;
|
|
grtmpbuf = (char *) __alloca (grbuflen);
|
|
__getgrnam_r (TTY_GROUP, &grbuf, grtmpbuf, grbuflen, &p);
|
|
if (p != NULL)
|
|
tty_gid = p->gr_gid;
|
|
}
|
|
gid_t gid = tty_gid == -1 ? __getgid () : tty_gid;
|
|
|
|
#if HAVE_PT_CHOWN
|
|
/* Make sure the group of the device is that special group. */
|
|
if (st.st_gid != gid)
|
|
{
|
|
if (__chown (buf, uid, gid) < 0)
|
|
goto helper;
|
|
}
|
|
|
|
/* Make sure the permission mode is set to readable and writable by
|
|
the owner, and writable by the group. */
|
|
mode_t mode = S_IRUSR|S_IWUSR|S_IWGRP;
|
|
#else
|
|
/* When built without pt_chown, we have delegated the creation of the
|
|
pty node with the right group and permission mode to the kernel, and
|
|
non-root users are unlikely to be able to change it. Therefore let's
|
|
consider that POSIX enforcement is the responsibility of the whole
|
|
system and not only the GNU libc. Thus accept different group or
|
|
permission mode. */
|
|
|
|
/* Make sure the permission is set to readable and writable by the
|
|
owner. For security reasons, make it writable by the group only
|
|
when originally writable and when the group of the device is that
|
|
special group. */
|
|
mode_t mode = S_IRUSR|S_IWUSR
|
|
|((st.st_gid == gid) ? (st.st_mode & S_IWGRP) : 0);
|
|
#endif
|
|
|
|
if ((st.st_mode & ACCESSPERMS) != mode)
|
|
{
|
|
if (__chmod (buf, mode) < 0)
|
|
goto helper;
|
|
}
|
|
|
|
retval = 0;
|
|
goto cleanup;
|
|
|
|
/* We have to use the helper program if it is available. */
|
|
helper:;
|
|
|
|
#if HAVE_PT_CHOWN
|
|
pid_t pid = __fork ();
|
|
if (pid == -1)
|
|
goto cleanup;
|
|
else if (pid == 0)
|
|
{
|
|
/* Disable core dumps. */
|
|
struct rlimit rl = { 0, 0 };
|
|
__setrlimit (RLIMIT_CORE, &rl);
|
|
|
|
/* We pass the master pseudo terminal as file descriptor PTY_FILENO. */
|
|
if (fd != PTY_FILENO)
|
|
if (__dup2 (fd, PTY_FILENO) < 0)
|
|
_exit (FAIL_EBADF);
|
|
|
|
# ifdef CLOSE_ALL_FDS
|
|
CLOSE_ALL_FDS ();
|
|
# endif
|
|
|
|
execle (_PATH_PT_CHOWN, __basename (_PATH_PT_CHOWN), NULL, NULL);
|
|
_exit (FAIL_EXEC);
|
|
}
|
|
else
|
|
{
|
|
int w;
|
|
|
|
if (__waitpid (pid, &w, 0) == -1)
|
|
goto cleanup;
|
|
if (!WIFEXITED (w))
|
|
__set_errno (ENOEXEC);
|
|
else
|
|
switch (WEXITSTATUS (w))
|
|
{
|
|
case 0:
|
|
retval = 0;
|
|
break;
|
|
case FAIL_EBADF:
|
|
__set_errno (EBADF);
|
|
break;
|
|
case FAIL_EINVAL:
|
|
__set_errno (EINVAL);
|
|
break;
|
|
case FAIL_EACCES:
|
|
__set_errno (EACCES);
|
|
break;
|
|
case FAIL_EXEC:
|
|
__set_errno (ENOEXEC);
|
|
break;
|
|
case FAIL_ENOMEM:
|
|
__set_errno (ENOMEM);
|
|
break;
|
|
|
|
default:
|
|
assert(! "grantpt: internal error: invalid exit code from pt_chown");
|
|
}
|
|
}
|
|
#endif
|
|
|
|
cleanup:
|
|
if (buf != _buf)
|
|
free (buf);
|
|
|
|
return retval;
|
|
}
|