mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-08 17:42:12 +03:00
This patch consolidates all the non cancellable close calls to use the __close_nocancel{_nostatus} identifier. For non cancellable targets it will be just a macro to call the default respective symbol while on Linux will be a internal one. Also, since it is used on libcrypto it is also exported in GLIBC_PRIVATE namespace. Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu. * sysdeps/generic/not-cancel.h (close_not_cancel): Remove macro. (close_not_cancel_no_status): Likewise. (__close_nocancel): New macro. (__close_nocancel_no_status): Likewise. * sysdeps/unix/sysv/linux/not-cancel.h (__close_nocancel): Remove macro. (close_not_cancel): Likewise. (close_not_cancel_no_status): Likewise. (__close_nocancel): New prototype. (__close_nocancel_no_status): New function. * sysdeps/unix/sysv/linux/close.c (__close_nocancel): New function. * catgets/open_catalog.c (__open_catalog): Replace close_not_cancel{_no_status) with __close_nocancel{_nostatus}. * gmon/gmon.c (write_gmon): Likewise. * iconv/gconv_cache.c (__gconv_load_cache): Likewise. * intl/loadmsgcat.c (close): Likewise. * io/ftw.c (open_dir_stream): Likewise. (ftw_startup): Likewise. * libio/fileops.c (_IO_file_open): Likewise. (_IO_file_close_mmap): Likewise. (_IO_file_close): Likewise. * libio/iopopen.c (_IO_dup2): Likewise. * locale/loadarchive.c (_nl_load_locale_from_archive): Likewise. * locale/loadlocale.c (_nl_load_locale): Likewise. * login/utmp_file.c (pututline_file): Likewise. (endutent_file): Likewise. * misc/daemon.c (daemon): Likewise. * nscd/nscd_getai.c (__nscd_getai): Likewise. * nscd/nscd_getgr_r.c (nscd_getgr_r): Likewise. * nscd/nscd_gethst_r.c (nscd_gethst_r): Likewise. * nscd/nscd_getpw_r.c (nscd_getpw_r): Likewise. * nscd/nscd_getserv_r.c (nscd_getserv_r): Likewise. * nscd/nscd_helper.c (open_socket): Likewise. (__nscd_open_socket): Likewise. * nscd/nscd_initgroups.c (__nscd_getgrouplist): Likewise. * nscd/nscd_netgroup.c (__nscd_setnetgrent): Likewise. (__nscd_innetgr): Likewise. * nss/nss_db/db-open.c (internal_setent): Likewise. * resolv/res-close.c (__res_iclose): Likewise. * sunrpc/pm_getmaps.c (pmap_getmaps): Likewise. * sysdeps/posix/closedir.c (__closedir): Likewise. * sysdeps/posix/getaddrinfo.c (getaddrinfo): Likewise. * sysdeps/posix/getcwd.c (__getcwd): Likewise. * sysdeps/posix/opendir.c (tryopen_o_directory): Likewise. (opendir_tail): Likewise. * sysdeps/posix/spawni.c (__spawni_child): Likewise. * sysdeps/unix/sysv/linux/check_native.c (__check_native): Likewise. * sysdeps/unix/sysv/linux/check_pf.c (__check_pf): Likewise. * sysdeps/unix/sysv/linux/fips-private.h (fips_enabled_p): Likewise. * sysdeps/unix/sysv/linux/gethostid.c (sethostid): Likewise. (gethostid): Likewise. * sysdeps/unix/sysv/linux/getloadavg.c (getloadavg): Likewise. * sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid): Likewise. * sysdeps/unix/sysv/linux/getsysstats.c (__get_nprocs): Likewise. * sysdeps/unix/sysv/linux/grantpt.c (close_all_fds): Likewise. * sysdeps/unix/sysv/linux/i386/smp.h (is_smp_system): Likewise. * sysdeps/unix/sysv/linux/ia64/has_cpuclock.c (has_cpuclock): Likewise. * sysdeps/unix/sysv/linux/if_index.c (__if_nametoindex): Likewise. * sysdeps/unix/sysv/linux/libc_fatal.c (backtrace_and_maps): Likewise. * sysdeps/unix/sysv/linux/malloc-sysdep.h (check_may_shrink_heap): Likewise. * sysdeps/unix/sysv/linux/mq_notify.c (init_mq_netlink): Likewise. * sysdeps/unix/sysv/linux/pthread_getname.c (pthread_getname_np): Likewise. * sysdeps/unix/sysv/linux/pthread_setname.c (pthread_setname_np): Likewise. * sysdeps/unix/sysv/linux/spawni.c (__spawni_child): Likewise. * sysdeps/unix/sysv/linux/sysconf.c (__sysconf): Likewise.
121 lines
3.1 KiB
C
121 lines
3.1 KiB
C
/* Copyright (C) 2010-2017 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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <pwd.h>
|
|
#include <unistd.h>
|
|
#include <not-cancel.h>
|
|
|
|
#define STATIC static
|
|
static int getlogin_r_fd0 (char *name, size_t namesize);
|
|
#define __getlogin_r getlogin_r_fd0
|
|
#include <sysdeps/unix/getlogin_r.c>
|
|
#undef __getlogin_r
|
|
|
|
|
|
/* Try to determine login name from /proc/self/loginuid and return 0
|
|
if successful. If /proc/self/loginuid cannot be read return -1.
|
|
Otherwise return the error number. */
|
|
|
|
int
|
|
attribute_hidden
|
|
__getlogin_r_loginuid (char *name, size_t namesize)
|
|
{
|
|
int fd = __open_nocancel ("/proc/self/loginuid", O_RDONLY);
|
|
if (fd == -1)
|
|
return -1;
|
|
|
|
/* We are reading a 32-bit number. 12 bytes are enough for the text
|
|
representation. If not, something is wrong. */
|
|
char uidbuf[12];
|
|
ssize_t n = TEMP_FAILURE_RETRY (__read_nocancel (fd, uidbuf,
|
|
sizeof (uidbuf)));
|
|
__close_nocancel_nostatus (fd);
|
|
|
|
uid_t uid;
|
|
char *endp;
|
|
if (n <= 0
|
|
|| n == sizeof (uidbuf)
|
|
|| (uidbuf[n] = '\0',
|
|
uid = strtoul (uidbuf, &endp, 10),
|
|
endp == uidbuf || *endp != '\0'))
|
|
return -1;
|
|
|
|
size_t buflen = 1024;
|
|
char *buf = alloca (buflen);
|
|
bool use_malloc = false;
|
|
struct passwd pwd;
|
|
struct passwd *tpwd;
|
|
int result = 0;
|
|
int res;
|
|
|
|
while ((res = __getpwuid_r (uid, &pwd, buf, buflen, &tpwd)) == ERANGE)
|
|
if (__libc_use_alloca (2 * buflen))
|
|
buf = extend_alloca (buf, buflen, 2 * buflen);
|
|
else
|
|
{
|
|
buflen *= 2;
|
|
char *newp = realloc (use_malloc ? buf : NULL, buflen);
|
|
if (newp == NULL)
|
|
{
|
|
result = ENOMEM;
|
|
goto out;
|
|
}
|
|
buf = newp;
|
|
use_malloc = true;
|
|
}
|
|
|
|
if (res != 0 || tpwd == NULL)
|
|
{
|
|
result = -1;
|
|
goto out;
|
|
}
|
|
|
|
size_t needed = strlen (pwd.pw_name) + 1;
|
|
if (needed > namesize)
|
|
{
|
|
__set_errno (ERANGE);
|
|
result = ERANGE;
|
|
goto out;
|
|
}
|
|
|
|
memcpy (name, pwd.pw_name, needed);
|
|
|
|
out:
|
|
if (use_malloc)
|
|
free (buf);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
/* Return at most NAME_LEN characters of the login name of the user in NAME.
|
|
If it cannot be determined or some other error occurred, return the error
|
|
code. Otherwise return 0. */
|
|
|
|
int
|
|
__getlogin_r (char *name, size_t namesize)
|
|
{
|
|
int res = __getlogin_r_loginuid (name, namesize);
|
|
if (res >= 0)
|
|
return res;
|
|
|
|
return getlogin_r_fd0 (name, namesize);
|
|
}
|
|
libc_hidden_def (__getlogin_r)
|
|
weak_alias (__getlogin_r, getlogin_r)
|
|
libc_hidden_weak (getlogin_r)
|