leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio: rng: allow tasks to be killed that are waiting for rng input

Browse Source 
Use wait_for_completion_killable() instead of wait_for_completion() when
waiting for the host to send us entropy.  Without this,

  # cat /dev/hwrng
  ^C

just hangs.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Amit Shah 2012-05-28 12:18:40 +05:30 committed by Rusty Russell
parent ddcc286900
commit cc8744e129
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/char/hw_random/virtio-rng.c
View File

@ -55,6 +55,7 @@ static void register_buffer(u8 *buf, size_t size)
static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)
{ {
int ret;
if (!busy) { if (!busy) {
busy = true; busy = true;
@ -65,7 +66,9 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)
if (!wait) if (!wait)
return 0; return 0;
wait_for_completion(&have_data); ret = wait_for_completion_killable(&have_data);
if (ret < 0)
return ret;
busy = false; busy = false;