Message ID | 20220301231038.530897-3-Jason@zx2c4.com (mailing list archive) |
---|---|
State | Not Applicable |
Delegated to: | Herbert Xu |
Headers | show |
Series | random: wire up in-kernel virtual machine fork notifications | expand |
On Wed, Mar 02, 2022 at 12:10:37AM +0100, Jason A. Donenfeld wrote: > Drivers such as WireGuard need to learn when VMs fork in order to clear > sessions. This commit provides a simple notifier_block for that, with a > register and unregister function. When no VM fork detection is compiled > in, this turns into a no-op, similar to how the power notifier works. > > Cc: Dominik Brodowski <linux@dominikbrodowski.net> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Theodore Ts'o <tytso@mit.edu> > Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> > --- > drivers/char/random.c | 15 +++++++++++++++ > include/linux/random.h | 5 +++++ > 2 files changed, 20 insertions(+) > > diff --git a/drivers/char/random.c b/drivers/char/random.c > index 6bd1bbab7392..483fd2dc2057 100644 > --- a/drivers/char/random.c > +++ b/drivers/char/random.c > @@ -1141,6 +1141,8 @@ void add_bootloader_randomness(const void *buf, size_t size) > EXPORT_SYMBOL_GPL(add_bootloader_randomness); > > #if IS_ENABLED(CONFIG_VMGENID) > +static BLOCKING_NOTIFIER_HEAD(vmfork_notifier); > + > /* > * Handle a new unique VM ID, which is unique, not secret, so we > * don't credit it, but we do immediately force a reseed after so > @@ -1152,11 +1154,24 @@ void add_vmfork_randomness(const void *unique_vm_id, size_t size) > if (crng_ready()) { > crng_reseed(true); > pr_notice("crng reseeded due to virtual machine fork\n"); > + blocking_notifier_call_chain(&vmfork_notifier, 0, NULL); > } > } > #if IS_MODULE(CONFIG_VMGENID) > EXPORT_SYMBOL_GPL(add_vmfork_randomness); > #endif > + > +int register_random_vmfork_notifier(struct notifier_block *nb) > +{ > + return blocking_notifier_chain_register(&vmfork_notifier, nb); > +} > +EXPORT_SYMBOL_GPL(register_random_vmfork_notifier); > + > +int unregister_random_vmfork_notifier(struct notifier_block *nb) > +{ > + return blocking_notifier_chain_unregister(&vmfork_notifier, nb); > +} > +EXPORT_SYMBOL_GPL(unregister_random_vmfork_notifier); > #endif > > struct fast_pool { > diff --git a/include/linux/random.h b/include/linux/random.h > index e84b6fa27435..7fccbc7e5a75 100644 > --- a/include/linux/random.h > +++ b/include/linux/random.h > @@ -31,6 +31,11 @@ extern void add_hwgenerator_randomness(const void *buffer, size_t count, > size_t entropy); > #if IS_ENABLED(CONFIG_VMGENID) > extern void add_vmfork_randomness(const void *unique_vm_id, size_t size); > +extern int register_random_vmfork_notifier(struct notifier_block *nb); > +extern int unregister_random_vmfork_notifier(struct notifier_block *nb); > +#else > +static inline int register_random_vmfork_notifier(struct notifier_block *nb) { return 0; } > +static inline int unregister_random_vmfork_notifier(struct notifier_block *nb) { return 0; } > #endif > > extern void get_random_bytes(void *buf, size_t nbytes); > -- > 2.35.1 > It seems crazy that the "we just were spawned as a new vm" notifier is based in the random driver, but sure, put it here for now! :) Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Hi Greg, On Wed, Mar 2, 2022 at 9:53 AM Greg KH <gregkh@linuxfoundation.org> wrote: > It seems crazy that the "we just were spawned as a new vm" notifier is > based in the random driver, but sure, put it here for now! :) I was thinking you might say this. I see it both ways, but I think I'm more inclined to doing it this way, at least for now. Here's how it breaks down: VM forking is usually an okay thing to do because computers are deterministic. Usually. Where is there non-determinism in a place that it matters? The RNG is supposed to be "the" place of non-determinism. If anything is going to happen in response to a VM fork, it's going to necessarily be _after_ the RNG becomes sufficiently non-deterministic again, and so it's the RNG who announces, "hey I'm safe to use again, and please read from me again if you're doing non-misuse resistant crypto." It's the proper place to announce that. On the other hand, I think you could argue that really this should come from vmgenid itself, with the caveat that the notifier is called after add_vmfork_randomness is called. For now that would exist in vmgenid.o itself, and then if we ever have multiple drivers notifying, some shared infrastructure could be made. Except vmgenid.o might be vmgenid.ko, and then the whole problem gets kind of annoying and maybe we actually want that shared infrastructure _now_ instead. And now we find ourselves complicating everything with additional Kbuild symbols and header files and stubs. It just seems like the road of more pain. Anyway, even if we go with the first solution -- keeping it in random.o -- now, I wouldn't be opposed to revisiting that decision later if the landscape becomes more complex. Luckily this is just the kernel side of things and not userspace, so we can easily change things down the road. Jason
diff --git a/drivers/char/random.c b/drivers/char/random.c index 6bd1bbab7392..483fd2dc2057 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -1141,6 +1141,8 @@ void add_bootloader_randomness(const void *buf, size_t size) EXPORT_SYMBOL_GPL(add_bootloader_randomness); #if IS_ENABLED(CONFIG_VMGENID) +static BLOCKING_NOTIFIER_HEAD(vmfork_notifier); + /* * Handle a new unique VM ID, which is unique, not secret, so we * don't credit it, but we do immediately force a reseed after so @@ -1152,11 +1154,24 @@ void add_vmfork_randomness(const void *unique_vm_id, size_t size) if (crng_ready()) { crng_reseed(true); pr_notice("crng reseeded due to virtual machine fork\n"); + blocking_notifier_call_chain(&vmfork_notifier, 0, NULL); } } #if IS_MODULE(CONFIG_VMGENID) EXPORT_SYMBOL_GPL(add_vmfork_randomness); #endif + +int register_random_vmfork_notifier(struct notifier_block *nb) +{ + return blocking_notifier_chain_register(&vmfork_notifier, nb); +} +EXPORT_SYMBOL_GPL(register_random_vmfork_notifier); + +int unregister_random_vmfork_notifier(struct notifier_block *nb) +{ + return blocking_notifier_chain_unregister(&vmfork_notifier, nb); +} +EXPORT_SYMBOL_GPL(unregister_random_vmfork_notifier); #endif struct fast_pool { diff --git a/include/linux/random.h b/include/linux/random.h index e84b6fa27435..7fccbc7e5a75 100644 --- a/include/linux/random.h +++ b/include/linux/random.h @@ -31,6 +31,11 @@ extern void add_hwgenerator_randomness(const void *buffer, size_t count, size_t entropy); #if IS_ENABLED(CONFIG_VMGENID) extern void add_vmfork_randomness(const void *unique_vm_id, size_t size); +extern int register_random_vmfork_notifier(struct notifier_block *nb); +extern int unregister_random_vmfork_notifier(struct notifier_block *nb); +#else +static inline int register_random_vmfork_notifier(struct notifier_block *nb) { return 0; } +static inline int unregister_random_vmfork_notifier(struct notifier_block *nb) { return 0; } #endif extern void get_random_bytes(void *buf, size_t nbytes);
Drivers such as WireGuard need to learn when VMs fork in order to clear sessions. This commit provides a simple notifier_block for that, with a register and unregister function. When no VM fork detection is compiled in, this turns into a no-op, similar to how the power notifier works. Cc: Dominik Brodowski <linux@dominikbrodowski.net> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> --- drivers/char/random.c | 15 +++++++++++++++ include/linux/random.h | 5 +++++ 2 files changed, 20 insertions(+)