| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <Y3liVEdYByF2gZZU@sol.localdomain>
Date: Sat, 19 Nov 2022 15:10:12 -0800
From: Eric Biggers <ebiggers@...nel.org>
To: "Jason A. Donenfeld" <Jason@...c4.com>
Cc: linux-kernel@...r.kernel.org, patches@...ts.linux.dev,
linux-crypto@...r.kernel.org, x86@...nel.org,
Thomas Gleixner <tglx@...utronix.de>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Adhemerval Zanella Netto <adhemerval.zanella@...aro.org>,
Carlos O'Donell <carlos@...hat.com>
Subject: Re: [PATCH v5 2/3] random: introduce generic vDSO getrandom()
implementation
On Sat, Nov 19, 2022 at 01:09:28PM +0100, Jason A. Donenfeld wrote:
> diff --git a/drivers/char/random.c b/drivers/char/random.c
> index ab6e02efa432..7dfdbf424c92 100644
> --- a/drivers/char/random.c
> +++ b/drivers/char/random.c
> @@ -61,6 +61,7 @@
> #include <asm/irq.h>
> #include <asm/irq_regs.h>
> #include <asm/io.h>
> +#include <vdso/datapage.h>
> #include "../../lib/vdso/getrandom.h"
>
> /*********************************************************************
> @@ -307,6 +308,8 @@ static void crng_reseed(struct work_struct *work)
> if (next_gen == ULONG_MAX)
> ++next_gen;
> WRITE_ONCE(base_crng.generation, next_gen);
> + if (IS_ENABLED(CONFIG_HAVE_VDSO_GETRANDOM))
> + smp_store_release(&_vdso_rng_data.generation, next_gen + 1);
Is the purpose of the smp_store_release() here to order the writes of
base_crng.generation and _vdso_rng_data.generation? It could use a comment.
> if (!static_branch_likely(&crng_is_ready))
> crng_init = CRNG_READY;
> spin_unlock_irqrestore(&base_crng.lock, flags);
> @@ -756,6 +759,8 @@ static void __cold _credit_init_bits(size_t bits)
> crng_reseed(NULL); /* Sets crng_init to CRNG_READY under base_crng.lock. */
> if (static_key_initialized)
> execute_in_process_context(crng_set_ready, &set_ready);
> + if (IS_ENABLED(CONFIG_HAVE_VDSO_GETRANDOM))
> + smp_store_release(&_vdso_rng_data.is_ready, true);
Similarly, is the purpose of this smp_store_release() to order the writes to the
the generation counters and is_ready? It could use a comment.
> diff --git a/lib/vdso/getrandom.c b/lib/vdso/getrandom.c
> new file mode 100644
> index 000000000000..8bef1e92a79d
> --- /dev/null
> +++ b/lib/vdso/getrandom.c
> @@ -0,0 +1,115 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2022 Jason A. Donenfeld <Jason@...c4.com>. All Rights Reserved.
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/atomic.h>
> +#include <linux/fs.h>
> +#include <vdso/datapage.h>
> +#include <asm/vdso/getrandom.h>
> +#include <asm/vdso/vsyscall.h>
> +#include "getrandom.h"
> +
> +#undef memcpy
> +#define memcpy(d,s,l) __builtin_memcpy(d,s,l)
> +#undef memset
> +#define memset(d,c,l) __builtin_memset(d,c,l)
> +
> +#define CHACHA_FOR_VDSO_INCLUDE
> +#include "../crypto/chacha.c"
> +
> +static void memcpy_and_zero(void *dst, void *src, size_t len)
> +{
> +#define CASCADE(type) \
> + while (len >= sizeof(type)) { \
> + *(type *)dst = *(type *)src; \
> + *(type *)src = 0; \
> + dst += sizeof(type); \
> + src += sizeof(type); \
> + len -= sizeof(type); \
> + }
> +#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
> +#if BITS_PER_LONG == 64
> + CASCADE(u64);
> +#endif
> + CASCADE(u32);
> + CASCADE(u16);
> +#endif
> + CASCADE(u8);
> +#undef CASCADE
> +}
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS doesn't mean that dereferencing
misaligned pointers is okay. You still need to use get_unaligned() and
put_unaligned(). Take a look at crypto_xor(), for example.
> +static __always_inline ssize_t
> +__cvdso_getrandom_data(const struct vdso_rng_data *rng_info, void *buffer, size_t len,
> + unsigned int flags, void *opaque_state)
> +{
> + ssize_t ret = min_t(size_t, MAX_RW_COUNT, len);
> + struct vgetrandom_state *state = opaque_state;
> + u32 chacha_state[CHACHA_STATE_WORDS];
> + unsigned long current_generation;
> + size_t batch_len;
> +
> + if (unlikely(!rng_info->is_ready))
> + return getrandom_syscall(buffer, len, flags);
> +
> + if (unlikely(!len))
> + return 0;
> +
> +retry_generation:
> + current_generation = READ_ONCE(rng_info->generation);
> + if (unlikely(state->generation != current_generation)) {
> + if (getrandom_syscall(state->key, sizeof(state->key), 0) != sizeof(state->key))
> + return getrandom_syscall(buffer, len, flags);
> + WRITE_ONCE(state->generation, current_generation);
> + state->pos = sizeof(state->batch);
> + }
> +
> + len = ret;
> +more_batch:
> + batch_len = min_t(size_t, sizeof(state->batch) - state->pos, len);
> + if (batch_len) {
> + memcpy_and_zero(buffer, state->batch + state->pos, batch_len);
> + state->pos += batch_len;
> + buffer += batch_len;
> + len -= batch_len;
> + }
> + if (!len) {
> + /*
> + * Since rng_info->generation will never be 0, we re-read state->generation,
> + * rather than using the local current_generation variable, to learn whether
> + * we forked.
> + */
> + if (unlikely(READ_ONCE(state->generation) != READ_ONCE(rng_info->generation))) {
> + buffer -= ret;
> + goto retry_generation;
> + }
> + return ret;
> + }
> +
> + chacha_init_consts(chacha_state);
> + memcpy(&chacha_state[4], state->key, CHACHA_KEY_SIZE);
> + memset(&chacha_state[12], 0, sizeof(u32) * 4);
> +
> + while (len >= CHACHA_BLOCK_SIZE) {
> + chacha20_block(chacha_state, buffer);
> + if (unlikely(chacha_state[12] == 0))
> + ++chacha_state[13];
> + buffer += CHACHA_BLOCK_SIZE;
> + len -= CHACHA_BLOCK_SIZE;
> + }
> +
> + chacha20_block(chacha_state, state->key_batch);
> + if (unlikely(chacha_state[12] == 0))
> + ++chacha_state[13];
> + chacha20_block(chacha_state, state->key_batch + CHACHA_BLOCK_SIZE);
> + state->pos = 0;
> + memzero_explicit(chacha_state, sizeof(chacha_state));
> + goto more_batch;
> +}
There's a lot of subtle stuff going on here. Adding some more comments would be
helpful. Maybe bring in some of the explanation that's currently only in the
commit message.
One question I have is about forking. So, when a thread calls fork(), in the
child the kernel automatically replaces all vgetrandom_state pages with zeroed
pages (due to MADV_WIPEONFORK). If the child calls __cvdso_getrandom_data()
afterwards, it sees the zeroed state. But that's indistinguishable from the
state at the very beginning, after sys_vgetrandom_alloc() was just called,
right? So as long as this code handles initializing the state at the beginning,
then I'd think it would naturally handle fork() as well.
However, it seems you have something a bit more subtle in mind, where the thread
calls fork() *while* it's in the middle of __cvdso_getrandom_data(). I guess
you are thinking of the case where a signal is sent to the thread while it's
executing __cvdso_getrandom_data(), and then the signal handler calls fork()?
Note that it doesn't matter if a different thread in the *process* calls fork().
If it's possible for the thread to fork() (and hence for the vgetrandom_state to
be zeroed) at absolutely any time, it probably would be a good idea to mark that
whole struct as volatile.
- Eric
Powered by blists - more mailing lists