|
 |
673c78 |
From a80ba745cc54d5ba726e48065aebe6dac50dedd2 Mon Sep 17 00:00:00 2001
|
|
|
673c78 |
From: Karel Zak <kzak@redhat.com>
|
|
|
673c78 |
Date: Mon, 24 Jan 2022 14:08:08 +0100
|
|
|
673c78 |
Subject: uuidd: fix open/lock state issue
|
|
|
673c78 |
|
|
|
673c78 |
* warn on open/lock state issue
|
|
|
673c78 |
|
|
|
673c78 |
* enable access to /var/lib/libuuid/, because ProtectSystem=strict make it read-only
|
|
|
673c78 |
|
|
|
673c78 |
openat(AT_FDCWD, "/var/lib/libuuid/clock.txt",
|
|
|
673c78 |
O_RDWR|O_CREAT|O_CLOEXEC, 0660) = -1 EROFS (Read-only file system)
|
|
|
673c78 |
|
|
|
673c78 |
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2040366
|
|
|
673c78 |
Upstream: http://github.com/util-linux/util-linux/commit/f27876f9c1056bf41fd940d5c4990b4277e0024f
|
|
|
673c78 |
Upstream: http://github.com/util-linux/util-linux/commit/417982d0236a12756923d88e627f5e4facf8951c
|
|
|
673c78 |
Signed-off-by: Karel Zak <kzak@redhat.com>
|
|
|
673c78 |
---
|
|
|
673c78 |
misc-utils/uuidd.c | 9 ++++++---
|
|
|
673c78 |
misc-utils/uuidd.service.in | 1 +
|
|
|
673c78 |
2 files changed, 7 insertions(+), 3 deletions(-)
|
|
|
673c78 |
|
|
|
673c78 |
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
|
|
|
673c78 |
index fa8db173b..78a37d2e8 100644
|
|
|
673c78 |
--- a/misc-utils/uuidd.c
|
|
|
673c78 |
+++ b/misc-utils/uuidd.c
|
|
|
673c78 |
@@ -494,7 +494,8 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
|
|
|
673c78 |
break;
|
|
|
673c78 |
case UUIDD_OP_TIME_UUID:
|
|
|
673c78 |
num = 1;
|
|
|
673c78 |
- __uuid_generate_time(uu, &num);
|
|
|
673c78 |
+ if (__uuid_generate_time(uu, &num) < 0 && !uuidd_cxt->quiet)
|
|
|
673c78 |
+ warnx(_("failed to open/lock clock counter"));
|
|
|
673c78 |
if (uuidd_cxt->debug) {
|
|
|
673c78 |
uuid_unparse(uu, str);
|
|
|
673c78 |
fprintf(stderr, _("Generated time UUID: %s\n"), str);
|
|
|
673c78 |
@@ -504,7 +505,8 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
|
|
|
673c78 |
break;
|
|
|
673c78 |
case UUIDD_OP_RANDOM_UUID:
|
|
|
673c78 |
num = 1;
|
|
|
673c78 |
- __uuid_generate_random(uu, &num);
|
|
|
673c78 |
+ if (__uuid_generate_time(uu, &num) < 0 && !uuidd_cxt->quiet)
|
|
|
673c78 |
+ warnx(_("failed to open/lock clock counter"));
|
|
|
673c78 |
if (uuidd_cxt->debug) {
|
|
|
673c78 |
uuid_unparse(uu, str);
|
|
|
673c78 |
fprintf(stderr, _("Generated random UUID: %s\n"), str);
|
|
|
673c78 |
@@ -513,7 +515,8 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
|
|
|
673c78 |
reply_len = sizeof(uu);
|
|
|
673c78 |
break;
|
|
|
673c78 |
case UUIDD_OP_BULK_TIME_UUID:
|
|
|
673c78 |
- __uuid_generate_time(uu, &num);
|
|
|
673c78 |
+ if (__uuid_generate_time(uu, &num) < 0 && !uuidd_cxt->quiet)
|
|
|
673c78 |
+ warnx(_("failed to open/lock clock counter"));
|
|
|
673c78 |
if (uuidd_cxt->debug) {
|
|
|
673c78 |
uuid_unparse(uu, str);
|
|
|
673c78 |
fprintf(stderr, P_("Generated time UUID %s "
|
|
|
673c78 |
diff --git a/misc-utils/uuidd.service.in b/misc-utils/uuidd.service.in
|
|
|
673c78 |
index b4c9c4635..e64ca59b5 100644
|
|
|
673c78 |
--- a/misc-utils/uuidd.service.in
|
|
|
673c78 |
+++ b/misc-utils/uuidd.service.in
|
|
|
673c78 |
@@ -18,6 +18,7 @@ ProtectKernelModules=yes
|
|
|
673c78 |
ProtectControlGroups=yes
|
|
|
673c78 |
RestrictAddressFamilies=AF_UNIX
|
|
|
673c78 |
MemoryDenyWriteExecute=yes
|
|
|
673c78 |
+ReadWritePaths=/var/lib/libuuid/
|
|
|
673c78 |
SystemCallFilter=@default @file-system @basic-io @system-service @signal @io-event @network-io
|
|
|
673c78 |
|
|
|
673c78 |
[Install]
|
|
|
673c78 |
--
|
|
|
673c78 |
2.34.1
|
|
|
673c78 |
|