d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug where this function overflowed it's buffer... This was

Browse Source 
causing ZFS panics on boot...

This is purely reviewed and tested by peter.

Reviewed by:	peter
Approved by:	so (implicit), peter
This commit is contained in:
John-Mark Gurney 2015-02-17 23:14:26 +00:00
parent bd9cab6fb4
commit 5da74e04ec
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/random/yarrow.c
View File

@ -432,6 +432,7 @@ reseed(u_int fastslow)
void
random_yarrow_read(uint8_t *buf, u_int bytecount)
{
uint8_t tbuf[BLOCKSIZE];
u_int blockcount, i;
/* Check for initial/final read requests */
@ -448,8 +449,15 @@ random_yarrow_read(uint8_t *buf, u_int bytecount)
yarrow_state.outputblocks = 0;
}
uint128_increment(&yarrow_state.counter.whole);
randomdev_encrypt(&yarrow_state.key, yarrow_state.counter.byte, buf, BLOCKSIZE);
buf += BLOCKSIZE;
if ((i + 1) * BLOCKSIZE > bytecount) {
randomdev_encrypt(&yarrow_state.key,
yarrow_state.counter.byte, tbuf, BLOCKSIZE);
memcpy(buf, tbuf, bytecount - i * BLOCKSIZE);
} else {
randomdev_encrypt(&yarrow_state.key,
yarrow_state.counter.byte, buf, BLOCKSIZE);
buf += BLOCKSIZE;
}
}
mtx_unlock(&random_reseed_mtx);