TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-02-18 21:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Directly use getrandom system call if possible

Browse Source
This commit is contained in:
topjohnwu 2022-02-16 23:57:28 -08:00
parent afa771a980
commit e7c82f20e3
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
native/jni/utils/misc.cpp
View File

@ -35,17 +35,21 @@ int fork_no_orphan() {
int gen_rand_str(char *buf, int len, bool varlen) { int gen_rand_str(char *buf, int len, bool varlen) {
constexpr char ALPHANUM[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; constexpr char ALPHANUM[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
static std::mt19937 gen([]{ static mt19937 gen([]{
if (access("/dev/urandom", F_OK) != 0) mt19937::result_type seed;
mknod("/dev/urandom", 0600 | S_IFCHR, makedev(1, 9)); if (syscall(__NR_getrandom, &seed, sizeof(seed), 0) < 0) {
int fd = xopen("/dev/urandom", O_RDONLY | O_CLOEXEC); // This can happen if device is running a too low Linux version
unsigned seed; if (access("/dev/urandom", F_OK) != 0)
xxread(fd, &seed, sizeof(seed)); mknod("/dev/urandom", 0600 | S_IFCHR, makedev(1, 9));
int fd = xopen("/dev/urandom", O_RDONLY | O_CLOEXEC);
xxread(fd, &seed, sizeof(seed));
close(fd);
}
return seed; return seed;
}()); }());
std::uniform_int_distribution<int> dist(0, sizeof(ALPHANUM) - 2); uniform_int_distribution<int> dist(0, sizeof(ALPHANUM) - 2);
if (varlen) { if (varlen) {
std::uniform_int_distribution<int> len_dist(len / 2, len); uniform_int_distribution<int> len_dist(len / 2, len);
len = len_dist(gen); len = len_dist(gen);
} }
for (int i = 0; i < len - 1; ++i) for (int i = 0; i < len - 1; ++i)