From 8ba12aef045ba1a766a73f535a114781dbb763c2 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 6 Aug 2018 15:58:16 +0200 Subject: [PATCH] random-seed: write the machine ID into /dev/urandom as well This is some extra protection for sloppy "golden master" systems, where images are duplicated many times but the random seed is not deleted (or reset for each copy). That golden master systems have to reset /etc/machine-id is better known, and easier to notice (as having the same ID will result in address conflicts and suchlike quite often). Hence let's write the machine ID into /dev/urandom, in case it has been initialized and unlikely the stored random seed has been provisioned differently on each image. Note that we don't credit the entropy either way, hence in the case there's a cycle of a) generating the machine-id early at boot and b) writing it back into /dev/urandom late at boot it shouldn't matter. It's never going to make things worse, just in a few cases better. --- src/random-seed/random-seed.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c index d25ee7d..f634625 100644 --- a/src/random-seed/random-seed.c +++ b/src/random-seed/random-seed.c @@ -6,6 +6,8 @@ #include #include +#include "sd-id128.h" + #include "alloc-util.h" #include "fd-util.h" #include "io-util.h" @@ -136,6 +138,8 @@ int main(int argc, char *argv[]) { } if (read_seed_file) { + sd_id128_t mid; + int z; k = loop_read(seed_fd, buf, buf_size, false); if (k < 0) @@ -150,6 +154,21 @@ int main(int argc, char *argv[]) { if (r < 0) log_error_errno(r, "Failed to write seed to /dev/urandom: %m"); } + + /* Let's also write the machine ID into the random seed. Why? As an extra protection against "golden + * images" that are put together sloppily, i.e. images which are duplicated on multiple systems but + * where the random seed file is not properly reset. Frequently the machine ID is properly reset on + * those systems however (simply because it's easier to notice, if it isn't due to address clashes and + * so on, while random seed equivalence is generally not noticed easily), hence let's simply write the + * machined ID into the random pool too. */ + z = sd_id128_get_machine(&mid); + if (z < 0) + log_debug_errno(z, "Failed to get machine ID, ignoring: %m"); + else { + z = loop_write(random_fd, &mid, sizeof(mid), false); + if (z < 0) + log_debug_errno(z, "Failed to write machine ID to /dev/urandom, ignoring: %m"); + } } if (write_seed_file) { -- 2.7.4