diff options
| author | Amit Shah <amit.shah@redhat.com> | 2012-05-28 12:18:40 +0530 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-07-30 13:30:49 +0930 |
| commit | cc8744e12936680478ce82b0f21dbaa272df1447 (patch) | |
| tree | fd54eea98b57bcf716ac36c9626f5efb4d0e3da6 /drivers/char/hw_random | |
| parent | ddcc286900732953ac2e950b6ad0f9a4933767fb (diff) | |
| download | linux-3.10-cc8744e12936680478ce82b0f21dbaa272df1447.tar.gz linux-3.10-cc8744e12936680478ce82b0f21dbaa272df1447.tar.bz2 linux-3.10-cc8744e12936680478ce82b0f21dbaa272df1447.zip | |
virtio: rng: allow tasks to be killed that are waiting for rng input
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>
Diffstat (limited to 'drivers/char/hw_random')
| -rw-r--r-- | drivers/char/hw_random/virtio-rng.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c index 723725bbb96..c8a93503421 100644 --- a/drivers/char/hw_random/virtio-rng.c +++ b/drivers/char/hw_random/virtio-rng.c @@ -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) { + int ret; if (!busy) { busy = true; @@ -65,7 +66,9 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) if (!wait) return 0; - wait_for_completion(&have_data); + ret = wait_for_completion_killable(&have_data); + if (ret < 0) + return ret; busy = false; |