X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Frandom.cpp;h=5a038a563e12b339a25f307cf4e83cc12c6d1bfc;hb=28f23191dcbf047429d51950a337a57d7a3f866a;hp=b282d67d0157386c26e8343709865bf66145d817;hpb=45cc2527c1b679884570130eca8f285b2a9a8406;p=lttng-tools.git

diff --git a/src/common/random.cpp b/src/common/random.cpp
index b282d67d0..5a038a563 100644
--- a/src/common/random.cpp
+++ b/src/common/random.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include <common/error.hpp>
 #include <common/file-descriptor.hpp>
 #include <common/format.hpp>
 #include <common/hashtable/utils.hpp>
@@ -72,9 +73,8 @@ void getrandom_nonblock(char *out_data, std::size_t size)
 	}
 }
 #else /* defined(__linux__) && defined(SYS_getrandom) && defined(HAVE_SYS_RANDOM_H) */
-__attribute__((noreturn))
-void getrandom_nonblock(char *out_data __attribute__((unused)),
-		std::size_t size __attribute__((unused)))
+__attribute__((noreturn)) void getrandom_nonblock(char *out_data __attribute__((unused)),
+						  std::size_t size __attribute__((unused)))
 {
 	LTTNG_THROW_RANDOM_PRODUCTION_ERROR("getrandom() is not supported by this platform");
 }
@@ -138,11 +138,11 @@ lttng::random::seed_t produce_random_seed_from_urandom()
 	}() };
 
 	lttng::random::seed_t seed;
-	const auto read_ret = lttng_read(urandom.fd(), &seed, sizeof(seed));
-	if (read_ret != sizeof(seed)) {
-		LTTNG_THROW_POSIX(fmt::format("Failed to read from `/dev/urandom`: size={}",
-					      sizeof(seed)),
-				  errno);
+	try {
+		urandom.read(&seed, sizeof(seed));
+	} catch (const std::exception& e) {
+		LTTNG_THROW_RANDOM_PRODUCTION_ERROR(fmt::format(
+			"Failed to read from `/dev/urandom`: size={}: {}", sizeof(seed), e.what()));
 	}
 
 	return seed;