mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-03 18:31:04 +00:00
eaad4f9e8f
Rather than buffering 16 MiB of entropy in userspace (by way of chacha20), simply call getrandom() every time. This approach is doubtlessly slower, for now, but trying to prematurely optimize arc4random appears to be leading toward all sorts of nasty properties and gotchas. Instead, this patch takes a much more conservative approach. The interface is added as a basic loop wrapper around getrandom(), and then later, the kernel and libc together can work together on optimizing that. This prevents numerous issues in which userspace is unaware of when it really must throw away its buffer, since we avoid buffering all together. Future improvements may include userspace learning more from the kernel about when to do that, which might make these sorts of chacha20-based optimizations more possible. The current heuristic of 16 MiB is meaningless garbage that doesn't correspond to anything the kernel might know about. So for now, let's just do something conservative that we know is correct and won't lead to cryptographic issues for users of this function. This patch might be considered along the lines of, "optimization is the root of all evil," in that the much more complex implementation it replaces moves too fast without considering security implications, whereas the incremental approach done here is a much safer way of going about things. Once this lands, we can take our time in optimizing this properly using new interplay between the kernel and userspace. getrandom(0) is used, since that's the one that ensures the bytes returned are cryptographically secure. But on systems without it, we fallback to using /dev/urandom. This is unfortunate because it means opening a file descriptor, but there's not much of a choice. Secondly, as part of the fallback, in order to get more or less the same properties of getrandom(0), we poll on /dev/random, and if the poll succeeds at least once, then we assume the RNG is initialized. This is a rough approximation, as the ancient "non-blocking pool" initialized after the "blocking pool", not before, and it may not port back to all ancient kernels, though it does to all kernels supported by glibc (≥3.2), so generally it's the best approximation we can do. The motivation for including arc4random, in the first place, is to have source-level compatibility with existing code. That means this patch doesn't attempt to litigate the interface itself. It does, however, choose a conservative approach for implementing it. Cc: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org> Cc: Florian Weimer <fweimer@redhat.com> Cc: Cristian Rodríguez <crrodriguez@opensuse.org> Cc: Paul Eggert <eggert@cs.ucla.edu> Cc: Mark Harris <mark.hsj@gmail.com> Cc: Eric Biggers <ebiggers@kernel.org> Cc: linux-crypto@vger.kernel.org Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
99 lines
2.8 KiB
C
99 lines
2.8 KiB
C
/* Uncancelable versions of cancelable interfaces. Linux/NPTL version.
|
|
Copyright (C) 2003-2022 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
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef NOT_CANCEL_H
|
|
# define NOT_CANCEL_H
|
|
|
|
#include <fcntl.h>
|
|
#include <sysdep.h>
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
#include <sys/poll.h>
|
|
#include <sys/syscall.h>
|
|
#include <sys/wait.h>
|
|
#include <time.h>
|
|
|
|
/* Non cancellable open syscall. */
|
|
__typeof (open) __open_nocancel;
|
|
|
|
/* Non cancellable open syscall (LFS version). */
|
|
__typeof (open64) __open64_nocancel;
|
|
|
|
/* Non cancellable openat syscall. */
|
|
__typeof (openat) __openat_nocancel;
|
|
|
|
/* Non cacellable openat syscall (LFS version). */
|
|
__typeof (openat64) __openat64_nocancel;
|
|
|
|
/* Non cancellable read syscall. */
|
|
__typeof (__read) __read_nocancel;
|
|
|
|
/* Non cancellable pread syscall (LFS version). */
|
|
__typeof (__pread64) __pread64_nocancel;
|
|
|
|
/* Uncancelable write. */
|
|
__typeof (__write) __write_nocancel;
|
|
|
|
/* Uncancelable close. */
|
|
__typeof (__close) __close_nocancel;
|
|
|
|
/* Non cancellable close syscall that does not also set errno in case of
|
|
failure. */
|
|
static inline void
|
|
__close_nocancel_nostatus (int fd)
|
|
{
|
|
__close_nocancel (fd);
|
|
}
|
|
|
|
/* Non cancellable writev syscall that does not also set errno in case of
|
|
failure. */
|
|
static inline void
|
|
__writev_nocancel_nostatus (int fd, const struct iovec *iov, int iovcnt)
|
|
{
|
|
INTERNAL_SYSCALL_CALL (writev, fd, iov, iovcnt);
|
|
}
|
|
|
|
static inline int
|
|
__getrandom_nocancel (void *buf, size_t buflen, unsigned int flags)
|
|
{
|
|
return INLINE_SYSCALL_CALL (getrandom, buf, buflen, flags);
|
|
}
|
|
|
|
static inline int
|
|
__poll_infinity_nocancel (struct pollfd *fds, nfds_t nfds)
|
|
{
|
|
return INLINE_SYSCALL_CALL (ppoll, fds, nfds, NULL, NULL, 0);
|
|
}
|
|
|
|
/* Uncancelable fcntl. */
|
|
__typeof (__fcntl) __fcntl64_nocancel;
|
|
|
|
#if IS_IN (libc) || IS_IN (rtld)
|
|
hidden_proto (__open_nocancel)
|
|
hidden_proto (__open64_nocancel)
|
|
hidden_proto (__openat_nocancel)
|
|
hidden_proto (__openat64_nocancel)
|
|
hidden_proto (__read_nocancel)
|
|
hidden_proto (__pread64_nocancel)
|
|
hidden_proto (__write_nocancel)
|
|
hidden_proto (__close_nocancel)
|
|
hidden_proto (__fcntl64_nocancel)
|
|
#endif
|
|
|
|
#endif /* NOT_CANCEL_H */
|