From 6240a2de17c6b71bce09e630821b23a30064f10bcb91b6f89ebb9b537f8f0c4b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 21 Apr 2015 09:29:12 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=867 --- ...addentropy-ioctl-to-load-random-seed.patch | 66 +++++++++---------- 1 file changed, 31 insertions(+), 35 deletions(-) diff --git a/use-rndaddentropy-ioctl-to-load-random-seed.patch b/use-rndaddentropy-ioctl-to-load-random-seed.patch index e6e8a1ce..1b6412ce 100644 --- a/use-rndaddentropy-ioctl-to-load-random-seed.patch +++ b/use-rndaddentropy-ioctl-to-load-random-seed.patch @@ -5,11 +5,11 @@ write back the bytes and increase the entropy bit counter. Related to bnc#892096 --- - systemd-210/src/random-seed/random-seed.c | 73 +++++++++++++++++++++++++----- - 1 file changed, 62 insertions(+), 11 deletions(-) + systemd-219/src/random-seed/random-seed.c | 71 +++++++++++++++++++++++++----- + 1 file changed, 61 insertions(+), 10 deletions(-) ---- systemd-210/src/random-seed/random-seed.c -+++ systemd-210/src/random-seed/random-seed.c 2015-04-14 11:38:08.617519434 +0000 +--- systemd-219/src/random-seed/random-seed.c ++++ systemd-219/src/random-seed/random-seed.c 2015-04-21 09:26:07.589518787 +0000 @@ -22,7 +22,9 @@ #include #include @@ -31,7 +31,7 @@ Related to bnc#892096 size_t buf_size = 0; ssize_t k; int r; -@@ -64,11 +66,12 @@ int main(int argc, char *argv[]) { +@@ -65,11 +67,12 @@ int main(int argc, char *argv[]) { if (buf_size <= POOL_SIZE_MIN) buf_size = POOL_SIZE_MIN; @@ -46,7 +46,7 @@ Related to bnc#892096 r = mkdir_parents_label(RANDOM_SEED, 0755); if (r < 0) { -@@ -82,6 +85,23 @@ int main(int argc, char *argv[]) { +@@ -83,6 +86,23 @@ int main(int argc, char *argv[]) { if (streq(argv[1], "load")) { @@ -70,7 +70,7 @@ Related to bnc#892096 seed_fd = open(RANDOM_SEED, O_RDWR|O_CLOEXEC|O_NOCTTY|O_CREAT, 0600); if (seed_fd < 0) { seed_fd = open(RANDOM_SEED, O_RDONLY|O_CLOEXEC|O_NOCTTY); -@@ -102,7 +122,7 @@ int main(int argc, char *argv[]) { +@@ -104,7 +124,7 @@ int main(int argc, char *argv[]) { } } @@ -79,28 +79,24 @@ Related to bnc#892096 if (k <= 0) { if (r != 0) -@@ -113,16 +133,32 @@ int main(int argc, char *argv[]) { +@@ -115,13 +135,29 @@ int main(int argc, char *argv[]) { } else { lseek(seed_fd, 0, SEEK_SET); -- k = loop_write(random_fd, buf, (size_t) k, false); -- if (k <= 0) { -- log_error("Failed to write seed to /dev/urandom: %s", r < 0 ? strerror(-r) : "short write"); +- r = loop_write(random_fd, buf, (size_t) k, false); +- if (r < 0) +- log_error_errno(r, "Failed to write seed to /dev/urandom: %m"); + if (entropy->entropy_count && (size_t) k == entropy->buf_size) { + r = ioctl(random_fd, RNDADDENTROPY, entropy); + if (r < 0) { -+ log_error("Failed to write seed to /dev/urandom: %m"); ++ log_error_errno(errno, "Failed to write seed to /dev/urandom: %m"); + r = -errno; + } + } else { -+ k = loop_write(random_fd, entropy->buf, (size_t) k, false); -+ if (k <= 0) { -+ log_error("Failed to write seed to /dev/urandom: %s", r < 0 ? strerror(-r) : "short write"); - -- r = k == 0 ? -EIO : (int) k; -+ r = k == 0 ? -EIO : (int) k; -+ } - } ++ r = loop_write(random_fd, buf, (size_t) k, false); ++ if (r < 0) ++ log_error_errno(r, "Failed to write seed to /dev/urandom: %m"); ++ } } } else if (streq(argv[1], "save")) { @@ -115,8 +111,8 @@ Related to bnc#892096 + seed_fd = open(RANDOM_SEED, O_WRONLY|O_CLOEXEC|O_NOCTTY|O_CREAT, 0600); if (seed_fd < 0) { - log_error("Failed to open " RANDOM_SEED ": %m"); -@@ -137,6 +173,21 @@ int main(int argc, char *argv[]) { + log_error_errno(errno, "Failed to open " RANDOM_SEED ": %m"); +@@ -136,6 +172,21 @@ int main(int argc, char *argv[]) { goto finish; } @@ -139,17 +135,17 @@ Related to bnc#892096 log_error("Unknown verb %s.", argv[1]); r = -EINVAL; @@ -149,12 +200,12 @@ int main(int argc, char *argv[]) { - fchmod(seed_fd, 0600); - fchown(seed_fd, 0, 0); + fchmod(seed_fd, 0600); + fchown(seed_fd, 0, 0); -- k = loop_read(random_fd, buf, buf_size, false); -+ k = loop_read(random_fd, entropy->buf, entropy->buf_size, false); - if (k <= 0) { - log_error("Failed to read new seed from /dev/urandom: %s", r < 0 ? strerror(-r) : "EOF"); - r = k == 0 ? -EIO : (int) k; - } else { -- r = loop_write(seed_fd, buf, (size_t) k, false); -+ r = loop_write(seed_fd, entropy->buf, (size_t) k, false); - if (r <= 0) { - log_error("Failed to write new random seed file: %s", r < 0 ? strerror(-r) : "short write"); - r = r == 0 ? -EIO : r; +- k = loop_read(random_fd, buf, buf_size, false); ++ k = loop_read(random_fd, entropy->buf, entropy->buf_size, false); + if (k <= 0) { + log_error("Failed to read new seed from /dev/urandom: %s", r < 0 ? strerror(-r) : "EOF"); + r = k == 0 ? -EIO : (int) k; + } else { +- r = loop_write(seed_fd, buf, (size_t) k, false); ++ r = loop_write(seed_fd, entropy->buf, (size_t) k, false); + if (r < 0) + log_error_errno(r, "Failed to write new random seed file: %m"); + }