haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

randomness: abort if we can't get randomness, with a message. 

Avoid using LOG_TRC etc. during static initializers before logging
is setup:

 #0  0x00007ffff7362183 in std::string::size() const () from /lib64/libstdc++.so.6
 #1  0x00000000007d1acc in std::operator==<char> (__lhs="", __rhs=<error reading variable: Cannot access memory at address 0xffffffffffffffe8>)
     at /opt/rh/devtoolset-12/root/usr/include/c++/12/bits/basic_string.h:3586
 #2  0x00000000008fdc04 in Poco::Logger::unsafeGet (name="") at src/Logger.cpp:289
 #3  0x00000000008fdb81 in Poco::Logger::get (name="") at src/Logger.cpp:280
 #4  0x000000000066a30f in Log::logger () at /opt/rh/devtoolset-12/root/usr/include/c++/12/bits/new_allocator.h:90
 #5  0x0000000000692f8e in Util::rng::getBytes (length=16) at ../common/Util.cpp:122
 #6  0x0000000000693312 in Util::rng::getSeed () at ../common/Util.cpp:91
 #7  0x000000000044f987 in __static_initialization_and_destruction_0 (__initialize_p=1, __priority=65535) at ../common/Log.hpp:87

Change-Id: I6a32a0d3f50a8e769994737d4c09befe11599b4e
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 9ff5c5bce6)
pull/8213/head
Michael Meeks 2024-01-31 19:37:00 +00:00 committed by Caolán McNamara
parent 062c03499b
commit fd34d9c11e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/Util.cpp
View File

@ -107,13 +107,16 @@ namespace Util
if (len != length)
#endif
{
LOG_TRC("Lower performance fallback - missing getrandom function");
const int fd = open("/dev/urandom", O_RDONLY);
if (fd < 0 ||
(len = read(fd, v.data(), length)) < 0 ||
std::size_t(len) < length)
{
LOG_ERR("failed to read " << length << " hard random bytes, got " << len << " for hash: " << errno);
fprintf(stderr, "No adequate source of randomness, "
"failed to read %ld bytes: with error %s\n",
(long int)length, strerror(errno));
// Potentially dangerous to continue without randomness
abort();
}
if (fd >= 0)
close(fd);