提交 7b5164fb 编写于 作者: J Jason A. Donenfeld

random: zero buffer after reading entropy from userspace

This buffer may contain entropic data that shouldn't stick around longer
than needed, so zero out the temporary buffer at the end of write_pool().
Reviewed-by: NDominik Brodowski <linux@dominikbrodowski.net>
Reviewed-by: NJann Horn <jannh@google.com>
Reviewed-by: NEric Biggers <ebiggers@google.com>
Signed-off-by: NJason A. Donenfeld <Jason@zx2c4.com>
上级 434537ae
...@@ -1336,19 +1336,24 @@ static __poll_t random_poll(struct file *file, poll_table *wait) ...@@ -1336,19 +1336,24 @@ static __poll_t random_poll(struct file *file, poll_table *wait)
static int write_pool(const char __user *ubuf, size_t count) static int write_pool(const char __user *ubuf, size_t count)
{ {
size_t len; size_t len;
int ret = 0;
u8 block[BLAKE2S_BLOCK_SIZE]; u8 block[BLAKE2S_BLOCK_SIZE];
while (count) { while (count) {
len = min(count, sizeof(block)); len = min(count, sizeof(block));
if (copy_from_user(block, ubuf, len)) if (copy_from_user(block, ubuf, len)) {
return -EFAULT; ret = -EFAULT;
goto out;
}
count -= len; count -= len;
ubuf += len; ubuf += len;
mix_pool_bytes(block, len); mix_pool_bytes(block, len);
cond_resched(); cond_resched();
} }
return 0; out:
memzero_explicit(block, sizeof(block));
return ret;
} }
static ssize_t random_write(struct file *file, const char __user *buffer, static ssize_t random_write(struct file *file, const char __user *buffer,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册