X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Frandom-seed.c;h=8b43bacadc67580f8657b1dc67b4ace6cf7effb1;hp=936ed4791b91548d573330fbe9997be32da21536;hb=4f4d6a7073e6aa740291bbe54da809024d372955;hpb=22f4096ca96acd504ac74e7dfad96f07edb6da51

diff --git a/src/random-seed.c b/src/random-seed.c
index 936ed4791..8b43bacad 100644
--- a/src/random-seed.c
+++ b/src/random-seed.c
@@ -43,13 +43,19 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
+        log_set_target(LOG_TARGET_AUTO);
         log_parse_environment();
         log_open();
 
+        umask(0022);
+
         /* Read pool size, if possible */
         if ((f = fopen("/proc/sys/kernel/random/poolsize", "re"))) {
-                fscanf(f, "%zu", &buf_size);
+                if (fscanf(f, "%zu", &buf_size) > 0) {
+                        /* poolsize is in bits on 2.6, but we want bytes */
+                        buf_size /= 8;
+                }
+
                 fclose(f);
         }
 
@@ -61,6 +67,11 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
+        if (mkdir_parents(RANDOM_SEED, 0755) < 0) {
+                log_error("Failed to create directories parents of %s: %m", RANDOM_SEED);
+                goto finish;
+        }
+
         /* When we load the seed we read it and write it to the device
          * and then immediately update the saved seed with new data,
          * to make sure the next boot gets seeded differently. */
@@ -81,9 +92,11 @@ int main(int argc, char *argv[]) {
                         }
                 }
 
-                if ((r = loop_read(seed_fd, buf, buf_size, false)) <= 0)
-                        log_error("Failed to read seed file: %s", r < 0 ? strerror(errno) : "EOF");
-                else {
+                if ((r = loop_read(seed_fd, buf, buf_size, false)) <= 0) {
+
+                        if (r != 0)
+                                log_error("Failed to read seed file: %m");
+                } else {
                         lseek(seed_fd, 0, SEEK_SET);
 
                         if ((r = loop_write(random_fd, buf, (size_t) r, false)) <= 0)