mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 03:10:05 +00:00
a992f506ff
The types affected are __sig_atomic_t, sig_atomic_t, __sigset_t, sigset_t, sigval_t, sigevent_t, and siginfo_t. __sig_atomic_t is a scalar, so it's now directly available from bits/types.h. The others get bits/types/ headers. Side effects include: There have been small changes to which non-signal headers expose which subset of the signal-related types. A couple of architectures' nested siginfo_t fields had to be renamed to prevent undesired macro expansion. Internal code that wants to manipulate signal masks must now include <sigsetops.h> (which is not installed) and should be aware that __sigaddset, __sigandset, __sigdelset, __sigemptyset, and __sigorset no longer return a value (unlike the public API). Relatedly, the public signal.h no longer declares any of those functions. The obsolete sigmask() macro no longer has a system-specific definition -- in the cases where it matters, it didn't work anyway. New Linux architectures should create bits/siginfo-arch.h and/or bits/siginfo-consts-arch.h to customize their siginfo_t, rather than duplicating everything in bits/siginfo.h (which no longer exists). Add new __SI_* macros if necessary. Ports to other operating systems are strongly encouraged to generalize this scheme further. * bits/sigevent-consts.h * bits/siginfo-consts.h * bits/types/__sigset_t.h * bits/types/sigevent_t.h * bits/types/siginfo_t.h * sysdeps/unix/sysv/linux/bits/sigevent-consts.h * sysdeps/unix/sysv/linux/bits/siginfo-consts.h * sysdeps/unix/sysv/linux/bits/types/__sigset_t.h * sysdeps/unix/sysv/linux/bits/types/sigevent_t.h * sysdeps/unix/sysv/linux/bits/types/siginfo_t.h: New system-dependent bits headers. * sysdeps/unix/sysv/linux/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/bits/siginfo-consts-arch.h * sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/ia64/bits/siginfo-consts-arch.h * sysdeps/unix/sysv/linux/mips/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/tile/bits/siginfo-consts-arch.h * sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h: New Linux-only system-dependent bits headers. * signal/bits/types/sig_atomic_t.h * signal/bits/types/sigset_t.h * signal/bits/types/sigval_t.h: New non-system-dependent bits headers. * sysdeps/generic/sigsetops.h * sysdeps/unix/sysv/linux/sigsetops.h: New internal headers. * include/bits/types/sig_atomic_t.h * include/bits/types/sigset_t.h * include/bits/types/sigval_t.h: New wrappers. * signal/sigsetops.h * bits/siginfo.h * bits/sigset.h * sysdeps/unix/sysv/linux/bits/siginfo.h * sysdeps/unix/sysv/linux/bits/sigset.h * sysdeps/unix/sysv/linux/ia64/bits/siginfo.h * sysdeps/unix/sysv/linux/mips/bits/siginfo.h * sysdeps/unix/sysv/linux/s390/bits/siginfo.h * sysdeps/unix/sysv/linux/sparc/bits/siginfo.h * sysdeps/unix/sysv/linux/tile/bits/siginfo.h * sysdeps/unix/sysv/linux/x86/bits/siginfo.h: Deleted. * signal/Makefile, sysdeps/unix/sysv/linux/Makefile: Update lists of installed headers. * posix/bits/types.h: Define __sig_atomic_t here. * signal/signal.h: Use the new bits headers; no need to handle __need_sig_atomic_t nor __need_sigset_t. Don't use __sigmask to define sigmask. * include/signal.h: No need to handle __need_sig_atomic_t nor __need_sigset_t. Don't define __sigemptyset. * io/sys/poll.h, setjmp/setjmp.h * sysdeps/arm/sys/ucontext.h, sysdeps/generic/sys/ucontext.h * sysdeps/i386/sys/ucontext.h, sysdeps/m68k/sys/ucontext.h * sysdeps/mach/hurd/i386/bits/sigcontext.h * sysdeps/mips/sys/ucontext.h, sysdeps/powerpc/novmxsetjmp.h * sysdeps/pthread/bits/sigthread.h * sysdeps/unix/sysv/linux/hppa/sys/ucontext.h * sysdeps/unix/sysv/linux/m68k/sys/ucontext.h * sysdeps/unix/sysv/linux/mips/sys/ucontext.h * sysdeps/unix/sysv/linux/nios2/sys/ucontext.h * sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h * sysdeps/unix/sysv/linux/s390/sys/ucontext.h * sysdeps/unix/sysv/linux/sh/sys/ucontext.h * sysdeps/unix/sysv/linux/sparc/sys/ucontext.h * sysdeps/unix/sysv/linux/tile/sys/ucontext.h * sysdeps/unix/sysv/linux/x86/sys/ucontext.h: Use bits/types/__sigset_t.h. * misc/sys/select.h, posix/spawn.h * sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h * sysdeps/unix/sysv/linux/sys/epoll.h * sysdeps/unix/sysv/linux/sys/signalfd.h: Use bits/types/sigset_t.h. * resolv/netdb.h, rt/mqueue.h: Use bits/types/sigevent_t.h. * rt/aio.h: Use bits/types/sigevent_t.h and bits/sigevent-consts.h. * socket/sys/socket.h: Don't include bits/sigset.h. * login/utmp_file.c, shadow/lckpwdf.c, signal/sigandset.c * signal/sigisempty.c, stdlib/abort.c, sysdeps/posix/profil.c * sysdeps/posix/sigignore.c, sysdeps/posix/sigintr.c * sysdeps/posix/signal.c, sysdeps/posix/sigset.c * sysdeps/posix/sprofil.c, sysdeps/posix/sysv_signal.c * sysdeps/unix/sysv/linux/nptl-signals.h: Include sigsetops.h. * signal/sigaddset.c, signal/sigandset.c, signal/sigdelset.c * signal/sigorset.c, stdlib/abort.c, sysdeps/posix/sigignore.c * sysdeps/posix/signal.c, sysdeps/posix/sigset.c: __sigaddset, __sigandset, __sigdelset, __sigemptyset, __sigorset now return no value. * signal/sigaddset.c, signal/sigdelset.c, signal/sigismem.c Include <errno.h>, <signal.h>, and <sigsetops.h> instead of "sigsetops.h". * signal/sigsetops.c: Explicitly define __sigismember, __sigaddset, and __sigdelset as compatibility symbols. * signal/Versions: Correct commentary on __sigpause, __sigaddset, __sigdelset, __sigismember. * inet/rcmd.c: Include sigsetops.h. Convert old code using __sigblock/__sigsetmask to use __sigprocmask and friends.
177 lines
5.0 KiB
C
177 lines
5.0 KiB
C
/* Handle locking of password file.
|
|
Copyright (C) 1996-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
|
|
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 <fcntl.h>
|
|
#include <libc-lock.h>
|
|
#include <shadow.h>
|
|
#include <signal.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/file.h>
|
|
#include <sigsetops.h>
|
|
|
|
#include <kernel-features.h>
|
|
|
|
|
|
/* Name of the lock file. */
|
|
#define PWD_LOCKFILE "/etc/.pwd.lock"
|
|
|
|
/* How long to wait for getting the lock before returning with an
|
|
error. */
|
|
#define TIMEOUT 15 /* sec */
|
|
|
|
|
|
/* File descriptor for lock file. */
|
|
static int lock_fd = -1;
|
|
|
|
/* Prevent problems in multithreaded program by using mutex. */
|
|
__libc_lock_define_initialized (static, lock)
|
|
|
|
|
|
/* Prototypes for local functions. */
|
|
static void noop_handler (int __sig);
|
|
|
|
|
|
/* We cannot simply return in error cases. We have to close the file
|
|
and perhaps restore the signal handler. */
|
|
#define RETURN_CLOSE_FD(code) \
|
|
do { \
|
|
if ((code) < 0 && lock_fd >= 0) \
|
|
{ \
|
|
__close (lock_fd); \
|
|
lock_fd = -1; \
|
|
} \
|
|
__libc_lock_unlock (lock); \
|
|
return (code); \
|
|
} while (0)
|
|
|
|
#define RETURN_RESTORE_HANDLER(code) \
|
|
do { \
|
|
/* Restore old action handler for alarm. We don't need to know \
|
|
about the current one. */ \
|
|
__sigaction (SIGALRM, &saved_act, NULL); \
|
|
RETURN_CLOSE_FD (code); \
|
|
} while (0)
|
|
|
|
#define RETURN_CLEAR_ALARM(code) \
|
|
do { \
|
|
/* Clear alarm. */ \
|
|
alarm (0); \
|
|
/* Restore old set of handled signals. We don't need to know \
|
|
about the current one.*/ \
|
|
__sigprocmask (SIG_SETMASK, &saved_set, NULL); \
|
|
RETURN_RESTORE_HANDLER (code); \
|
|
} while (0)
|
|
|
|
|
|
int
|
|
__lckpwdf (void)
|
|
{
|
|
sigset_t saved_set; /* Saved set of caught signals. */
|
|
struct sigaction saved_act; /* Saved signal action. */
|
|
sigset_t new_set; /* New set of caught signals. */
|
|
struct sigaction new_act; /* New signal action. */
|
|
struct flock fl; /* Information struct for locking. */
|
|
int result;
|
|
|
|
if (lock_fd != -1)
|
|
/* Still locked by own process. */
|
|
return -1;
|
|
|
|
/* Prevent problems caused by multiple threads. */
|
|
__libc_lock_lock (lock);
|
|
|
|
int oflags = O_WRONLY | O_CREAT | O_CLOEXEC;
|
|
lock_fd = __open (PWD_LOCKFILE, oflags, 0600);
|
|
if (lock_fd == -1)
|
|
/* Cannot create lock file. */
|
|
RETURN_CLOSE_FD (-1);
|
|
|
|
/* Now we have to get exclusive write access. Since multiple
|
|
process could try this we won't stop when it first fails.
|
|
Instead we set a timeout for the system call. Once the timer
|
|
expires it is likely that there are some problems which cannot be
|
|
resolved by waiting.
|
|
|
|
It is important that we don't change the signal state. We must
|
|
restore the old signal behaviour. */
|
|
memset (&new_act, '\0', sizeof (struct sigaction));
|
|
new_act.sa_handler = noop_handler;
|
|
__sigfillset (&new_act.sa_mask);
|
|
new_act.sa_flags = 0ul;
|
|
|
|
/* Install new action handler for alarm and save old. */
|
|
if (__sigaction (SIGALRM, &new_act, &saved_act) < 0)
|
|
/* Cannot install signal handler. */
|
|
RETURN_CLOSE_FD (-1);
|
|
|
|
/* Now make sure the alarm signal is not blocked. */
|
|
__sigemptyset (&new_set);
|
|
__sigaddset (&new_set, SIGALRM);
|
|
if (__sigprocmask (SIG_UNBLOCK, &new_set, &saved_set) < 0)
|
|
RETURN_RESTORE_HANDLER (-1);
|
|
|
|
/* Start timer. If we cannot get the lock in the specified time we
|
|
get a signal. */
|
|
alarm (TIMEOUT);
|
|
|
|
/* Try to get the lock. */
|
|
memset (&fl, '\0', sizeof (struct flock));
|
|
fl.l_type = F_WRLCK;
|
|
fl.l_whence = SEEK_SET;
|
|
result = __fcntl (lock_fd, F_SETLKW, &fl);
|
|
|
|
RETURN_CLEAR_ALARM (result);
|
|
}
|
|
weak_alias (__lckpwdf, lckpwdf)
|
|
|
|
|
|
int
|
|
__ulckpwdf (void)
|
|
{
|
|
int result;
|
|
|
|
if (lock_fd == -1)
|
|
/* There is no lock set. */
|
|
result = -1;
|
|
else
|
|
{
|
|
/* Prevent problems caused by multiple threads. */
|
|
__libc_lock_lock (lock);
|
|
|
|
result = __close (lock_fd);
|
|
|
|
/* Mark descriptor as unused. */
|
|
lock_fd = -1;
|
|
|
|
/* Clear mutex. */
|
|
__libc_lock_unlock (lock);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
weak_alias (__ulckpwdf, ulckpwdf)
|
|
|
|
|
|
static void
|
|
noop_handler (int sig)
|
|
{
|
|
/* We simply return which makes the `fcntl' call return with an error. */
|
|
}
|