hwrng: fix unregister race.

The previous patch added one potential problem: we can still be
reading from a hwrng when it's unregistered.  Add a wait for zero
in the hwrng_unregister path.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Amos Kong <akong@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 089c18dc579eadf8c12bead16b1f61990cd8248d..8d609a026465a73a2eb6fedf14727efba597df9a 100644 (file)
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -60,6 +60,7 @@ static DEFINE_MUTEX(rng_mutex);
 static DEFINE_MUTEX(reading_mutex);
 static int data_avail;
 static u8 *rng_buffer, *rng_fillbuf;
+static DECLARE_WAIT_QUEUE_HEAD(rng_done);
 static unsigned short current_quality;
 static unsigned short default_quality; /* = 0; default to "off" */
 
@@ -98,6 +99,11 @@ static inline void cleanup_rng(struct kref *kref)
 
        if (rng->cleanup)
                rng->cleanup(rng);
+
+       /* cleanup_done should be updated after cleanup finishes */
+       smp_wmb();
+       rng->cleanup_done = true;
+       wake_up_all(&rng_done);
 }
 
 static void set_current_rng(struct hwrng *rng)
@@ -494,6 +500,8 @@ int hwrng_register(struct hwrng *rng)
                add_early_randomness(rng);
        }
 
+       rng->cleanup_done = false;
+
 out_unlock:
        mutex_unlock(&rng_mutex);
 out:
@@ -525,6 +533,10 @@ void hwrng_unregister(struct hwrng *rng)
                        kthread_stop(hwrng_fill);
        } else
                mutex_unlock(&rng_mutex);
+
+       /* Just in case rng is reading right now, wait. */
+       wait_event(rng_done, rng->cleanup_done &&
+                  atomic_read(&rng->ref.refcount) == 0);
 }
 EXPORT_SYMBOL_GPL(hwrng_unregister);
 

diff --git a/include/linux/hw_random.h b/include/linux/hw_random.h
index c212e71ea88625f5e8dd97691587941b3bb204b9..7832e5008959e6ef27ea2f4f79a63737a6ed10ce 100644 (file)
--- a/include/linux/hw_random.h
+++ b/include/linux/hw_random.h
@@ -46,6 +46,7 @@ struct hwrng {
        /* internal. */
        struct list_head list;
        struct kref ref;
+       bool cleanup_done;
 };
 
 /** Register a new Hardware Random Number Generator driver. */