Skip to content

Commit 35a33ff

Browse files
committed
random: use memmove instead of memcpy for remaining 32 bytes
In order to immediately overwrite the old key on the stack, before servicing a userspace request for bytes, we use the remaining 32 bytes of block 0 as the key. This means moving indices 8,9,a,b,c,d,e,f -> 4,5,6,7,8,9,a,b. Since 4 < 8, for the kernel implementations of memcpy(), this doesn't actually appear to be a problem in practice. But relying on that characteristic seems a bit brittle. So let's change that to a proper memmove(), which is the by-the-books way of handling overlapping memory copies. Reviewed-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
1 parent b0c3e79 commit 35a33ff

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/char/random.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ static void crng_fast_key_erasure(u8 key[CHACHA_KEY_SIZE],
333333
chacha20_block(chacha_state, first_block);
334334

335335
memcpy(key, first_block, CHACHA_KEY_SIZE);
336-
memcpy(random_data, first_block + CHACHA_KEY_SIZE, random_data_len);
336+
memmove(random_data, first_block + CHACHA_KEY_SIZE, random_data_len);
337337
memzero_explicit(first_block, sizeof(first_block));
338338
}
339339

0 commit comments

Comments
 (0)