Skip to content

Commit 60d682b

Browse files
committed
Fix asserts & short-read bug in isaac_seed (#2870)
1 parent 4378e7e commit 60d682b

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

src/rt/rust_builtin.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ rand_seed() {
182182
rust_vec *v = (rust_vec *) task->kernel->malloc(vec_size<uint8_t>(size),
183183
"rand_seed");
184184
v->fill = v->alloc = size;
185-
isaac_seed(task->kernel, (uint8_t*) &v->data);
185+
isaac_seed(task->kernel, (uint8_t*) &v->data, size);
186186
return v;
187187
}
188188

src/rt/rust_util.h

+10-5
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,8 @@ inline size_t get_box_size(size_t body_size, size_t body_align) {
128128

129129
// Initialization helpers for ISAAC RNG
130130

131-
inline void isaac_seed(rust_kernel* kernel, uint8_t* dest)
131+
inline void isaac_seed(rust_kernel* kernel, uint8_t* dest, size_t size)
132132
{
133-
size_t size = sizeof(ub4) * RANDSIZ;
134133
#ifdef __WIN32__
135134
HCRYPTPROV hProv;
136135
kernel->win32_require
@@ -144,8 +143,14 @@ inline void isaac_seed(rust_kernel* kernel, uint8_t* dest)
144143
#else
145144
int fd = open("/dev/urandom", O_RDONLY);
146145
assert(fd > 0);
147-
assert(read(fd, dest, size) == (int) size);
148-
assert(close(fd) == 0);
146+
size_t amount = 0;
147+
do {
148+
ssize_t ret = read(fd, dest+amount, size-amount);
149+
assert(ret >= 0);
150+
amount += (size_t)ret;
151+
} while (amount < size);
152+
int ret = close(fd);
153+
assert(ret == 0);
149154
#endif
150155
}
151156

@@ -167,7 +172,7 @@ isaac_init(rust_kernel *kernel, randctx *rctx, rust_vec_box* user_seed)
167172
seed = (seed + 0x7ed55d16) + (seed << 12);
168173
}
169174
} else {
170-
isaac_seed(kernel, (uint8_t*) &rctx->randrsl);
175+
isaac_seed(kernel, (uint8_t*) &rctx->randrsl, sizeof(rctx->randrsl));
171176
}
172177

173178
randinit(rctx, 1);

0 commit comments

Comments
 (0)