2020-01-01 00:14:33 +00:00
|
|
|
/* Copyright (C) 2001-2020 Free Software Foundation, Inc.
|
2001-07-29 12:26:40 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2002-08-26 22:40:48 +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
|
2001-07-29 12:26:40 +00:00
|
|
|
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
|
2002-08-26 22:40:48 +00:00
|
|
|
Lesser General Public License for more details.
|
2001-07-29 12:26:40 +00:00
|
|
|
|
2002-08-26 22:40:48 +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; see the file COPYING.LIB. If
|
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
|
|
|
not, see <https://www.gnu.org/licenses/>. */
|
2001-07-29 12:26:40 +00:00
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <sys/un.h>
|
|
|
|
|
|
|
|
#include <hurd.h>
|
|
|
|
#include <hurd/fd.h>
|
|
|
|
#include <hurd/ifsock.h>
|
|
|
|
#include <hurd/socket.h>
|
2020-06-14 17:09:59 +00:00
|
|
|
#include <sysdep-cancel.h>
|
2015-02-08 03:25:12 +00:00
|
|
|
#include "hurd/hurdsocket.h"
|
2001-07-29 12:26:40 +00:00
|
|
|
|
|
|
|
/* Send a message described MESSAGE on socket FD.
|
|
|
|
Returns the number of bytes sent, or -1 for errors. */
|
|
|
|
ssize_t
|
|
|
|
__libc_sendmsg (int fd, const struct msghdr *message, int flags)
|
|
|
|
{
|
|
|
|
error_t err = 0;
|
2019-12-29 15:34:20 +00:00
|
|
|
struct cmsghdr *cmsg;
|
|
|
|
mach_port_t *ports = NULL;
|
|
|
|
mach_msg_type_number_t nports = 0;
|
|
|
|
int *fds, nfds;
|
2001-07-29 12:26:40 +00:00
|
|
|
struct sockaddr_un *addr = message->msg_name;
|
|
|
|
socklen_t addr_len = message->msg_namelen;
|
|
|
|
addr_port_t aport = MACH_PORT_NULL;
|
2004-02-11 02:01:22 +00:00
|
|
|
union
|
|
|
|
{
|
|
|
|
char *ptr;
|
|
|
|
vm_address_t addr;
|
|
|
|
} data = { .ptr = NULL };
|
2001-07-29 12:26:40 +00:00
|
|
|
char data_buf[2048];
|
|
|
|
mach_msg_type_number_t len;
|
|
|
|
mach_msg_type_number_t amount;
|
|
|
|
int dealloc = 0;
|
2019-12-29 15:34:20 +00:00
|
|
|
int socketrpc = 0;
|
2001-07-29 12:26:40 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Find the total number of bytes to be written. */
|
|
|
|
len = 0;
|
|
|
|
for (i = 0; i < message->msg_iovlen; i++)
|
|
|
|
{
|
|
|
|
if (message->msg_iov[i].iov_len > 0)
|
|
|
|
{
|
|
|
|
/* As an optimization, if we only have a single non-empty
|
|
|
|
iovec, we set DATA and LEN from it. */
|
|
|
|
if (len == 0)
|
2004-02-11 02:01:22 +00:00
|
|
|
data.ptr = message->msg_iov[i].iov_base;
|
2001-07-29 12:26:40 +00:00
|
|
|
else
|
2004-02-11 02:01:22 +00:00
|
|
|
data.ptr = NULL;
|
2001-07-29 12:26:40 +00:00
|
|
|
|
|
|
|
len += message->msg_iov[i].iov_len;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-02-11 02:01:22 +00:00
|
|
|
if (data.ptr == NULL)
|
2001-07-29 12:26:40 +00:00
|
|
|
{
|
|
|
|
size_t to_copy;
|
|
|
|
char *buf;
|
|
|
|
|
|
|
|
/* Allocate a temporary buffer to hold the data. For small
|
|
|
|
amounts of data, we allocate a buffer on the stack. Larger
|
|
|
|
amounts of data are stored in a page-aligned buffer. The
|
|
|
|
limit of 2048 bytes is inspired by the MiG stubs. */
|
|
|
|
if (len > 2048)
|
|
|
|
{
|
2004-02-11 02:01:22 +00:00
|
|
|
err = __vm_allocate (__mach_task_self (), &data.addr, len, 1);
|
2001-07-29 12:26:40 +00:00
|
|
|
if (err)
|
|
|
|
{
|
|
|
|
__set_errno (err);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
dealloc = 1;
|
|
|
|
}
|
|
|
|
else
|
2004-02-11 02:01:22 +00:00
|
|
|
data.ptr = data_buf;
|
2001-07-29 12:26:40 +00:00
|
|
|
|
|
|
|
/* Copy the data into DATA. */
|
|
|
|
to_copy = len;
|
2004-02-11 02:01:22 +00:00
|
|
|
buf = data.ptr;
|
2001-07-29 12:26:40 +00:00
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
{
|
|
|
|
#define min(a, b) ((a) > (b) ? (b) : (a))
|
|
|
|
size_t copy = min (message->msg_iov[i].iov_len, to_copy);
|
|
|
|
|
|
|
|
buf = __mempcpy (buf, message->msg_iov[i].iov_base, copy);
|
|
|
|
|
|
|
|
to_copy -= copy;
|
|
|
|
if (to_copy == 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-29 15:34:20 +00:00
|
|
|
/* Allocate enough room for ports. */
|
|
|
|
cmsg = CMSG_FIRSTHDR (message);
|
2019-12-29 16:47:52 +00:00
|
|
|
for (; cmsg; cmsg = CMSG_NXTHDR ((struct msghdr *) message, cmsg))
|
2019-12-29 15:34:20 +00:00
|
|
|
if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS)
|
|
|
|
nports += (cmsg->cmsg_len - CMSG_ALIGN (sizeof (struct cmsghdr)))
|
|
|
|
/ sizeof (int);
|
|
|
|
|
|
|
|
if (nports)
|
|
|
|
ports = __alloca (nports * sizeof (mach_port_t));
|
|
|
|
|
|
|
|
nports = 0;
|
|
|
|
for (cmsg = CMSG_FIRSTHDR (message);
|
|
|
|
cmsg;
|
2019-12-29 16:47:52 +00:00
|
|
|
cmsg = CMSG_NXTHDR ((struct msghdr *) message, cmsg))
|
2019-12-29 15:34:20 +00:00
|
|
|
{
|
|
|
|
if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS)
|
|
|
|
{
|
|
|
|
/* SCM_RIGHTS support: send FDs. */
|
|
|
|
fds = (int *) CMSG_DATA (cmsg);
|
|
|
|
nfds = (cmsg->cmsg_len - CMSG_ALIGN (sizeof (struct cmsghdr)))
|
|
|
|
/ sizeof (int);
|
|
|
|
|
|
|
|
for (i = 0; i < nfds; i++)
|
|
|
|
{
|
|
|
|
err = HURD_DPORT_USE
|
|
|
|
(fds[i],
|
|
|
|
({
|
|
|
|
err = __io_restrict_auth (port, &ports[nports],
|
|
|
|
0, 0, 0, 0);
|
|
|
|
if (! err)
|
|
|
|
nports++;
|
|
|
|
/* We pass the flags in the control data. */
|
|
|
|
fds[i] = descriptor->flags;
|
|
|
|
err;
|
|
|
|
}));
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-07-29 12:26:40 +00:00
|
|
|
if (addr)
|
|
|
|
{
|
|
|
|
if (addr->sun_family == AF_LOCAL)
|
|
|
|
{
|
2015-02-08 03:25:12 +00:00
|
|
|
char *name = _hurd_sun_path_dupa (addr, addr_len);
|
2001-07-29 12:26:40 +00:00
|
|
|
/* For the local domain, we must look up the name as a file
|
|
|
|
and talk to it with the ifsock protocol. */
|
2015-02-08 03:25:12 +00:00
|
|
|
file_t file = __file_name_lookup (name, 0, 0);
|
2001-07-29 12:26:40 +00:00
|
|
|
if (file == MACH_PORT_NULL)
|
2010-07-21 02:19:34 +00:00
|
|
|
{
|
2019-12-29 15:34:20 +00:00
|
|
|
err = errno;
|
|
|
|
goto out;
|
2010-07-21 02:19:34 +00:00
|
|
|
}
|
2001-07-29 12:26:40 +00:00
|
|
|
err = __ifsock_getsockaddr (file, &aport);
|
|
|
|
__mach_port_deallocate (__mach_task_self (), file);
|
|
|
|
if (err == MIG_BAD_ID || err == EOPNOTSUPP)
|
|
|
|
/* The file did not grok the ifsock protocol. */
|
|
|
|
err = ENOTSOCK;
|
|
|
|
if (err)
|
2019-12-29 15:34:20 +00:00
|
|
|
goto out;
|
2001-07-29 12:26:40 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
err = EIEIO;
|
|
|
|
}
|
|
|
|
|
2020-06-28 00:15:56 +00:00
|
|
|
err = HURD_DPORT_USE_CANCEL (fd,
|
2001-07-29 12:26:40 +00:00
|
|
|
({
|
|
|
|
if (err)
|
|
|
|
err = __socket_create_address (port,
|
|
|
|
addr->sun_family,
|
|
|
|
(char *) addr,
|
|
|
|
addr_len,
|
|
|
|
&aport);
|
|
|
|
if (! err)
|
|
|
|
{
|
|
|
|
/* Send the data. */
|
2020-06-14 17:09:59 +00:00
|
|
|
int cancel_oldtype = LIBC_CANCEL_ASYNC();
|
2001-07-29 12:26:40 +00:00
|
|
|
err = __socket_send (port, aport,
|
2004-02-11 02:01:22 +00:00
|
|
|
flags, data.ptr, len,
|
2019-12-29 15:34:20 +00:00
|
|
|
ports,
|
|
|
|
MACH_MSG_TYPE_COPY_SEND,
|
|
|
|
nports,
|
2001-07-29 12:26:40 +00:00
|
|
|
message->msg_control,
|
|
|
|
message->msg_controllen,
|
|
|
|
&amount);
|
2020-06-14 17:09:59 +00:00
|
|
|
LIBC_CANCEL_RESET (cancel_oldtype);
|
2001-07-29 12:26:40 +00:00
|
|
|
__mach_port_deallocate (__mach_task_self (),
|
|
|
|
aport);
|
|
|
|
}
|
|
|
|
err;
|
|
|
|
}));
|
2019-12-29 15:34:20 +00:00
|
|
|
socketrpc = 1;
|
|
|
|
|
|
|
|
out:
|
|
|
|
for (i = 0; i < nports; i++)
|
|
|
|
__mach_port_deallocate (__mach_task_self (), ports[i]);
|
2001-07-29 12:26:40 +00:00
|
|
|
|
|
|
|
if (dealloc)
|
2004-02-11 02:01:22 +00:00
|
|
|
__vm_deallocate (__mach_task_self (), data.addr, len);
|
2001-07-29 12:26:40 +00:00
|
|
|
|
2019-12-29 15:34:20 +00:00
|
|
|
if (socketrpc)
|
|
|
|
return err ? __hurd_sockfail (fd, flags, err) : amount;
|
|
|
|
else
|
|
|
|
return __hurd_fail (err);
|
2001-07-29 12:26:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
weak_alias (__libc_sendmsg, sendmsg)
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 00:22:23 +00:00
|
|
|
weak_alias (__libc_sendmsg, __sendmsg)
|