diff options
author | Theodore Ts'o <tytso@mit.edu> | 2018-04-23 18:51:28 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2018-04-24 12:00:08 -0400 |
commit | 6c1e851c4edc13a43adb3ea4044e3fc8f43ccf7d (patch) | |
tree | 0762f3b03339b0ab30f3163ab0ac314b75f05d02 /drivers/char/random.c | |
parent | d848e5f8e1ebdb227d045db55fe4f825e82965fa (diff) |
random: fix possible sleeping allocation from irq context
We can do a sleeping allocation from an irq context when CONFIG_NUMA
is enabled. Fix this by initializing the NUMA crng instances in a
workqueue.
Reported-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Reported-by: syzbot+9de458f6a5e713ee8c1a@syzkaller.appspotmail.com
Fixes: 8ef35c866f8862df ("random: set up the NUMA crng instances...")
Cc: stable@vger.kernel.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'drivers/char/random.c')
-rw-r--r-- | drivers/char/random.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index 3cd3aae24d6d..721dca8db9cf 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
@@ -789,7 +789,7 @@ static void crng_initialize(struct crng_state *crng) | |||
789 | } | 789 | } |
790 | 790 | ||
791 | #ifdef CONFIG_NUMA | 791 | #ifdef CONFIG_NUMA |
792 | static void numa_crng_init(void) | 792 | static void do_numa_crng_init(struct work_struct *work) |
793 | { | 793 | { |
794 | int i; | 794 | int i; |
795 | struct crng_state *crng; | 795 | struct crng_state *crng; |
@@ -810,6 +810,13 @@ static void numa_crng_init(void) | |||
810 | kfree(pool); | 810 | kfree(pool); |
811 | } | 811 | } |
812 | } | 812 | } |
813 | |||
814 | static DECLARE_WORK(numa_crng_init_work, do_numa_crng_init); | ||
815 | |||
816 | static void numa_crng_init(void) | ||
817 | { | ||
818 | schedule_work(&numa_crng_init_work); | ||
819 | } | ||
813 | #else | 820 | #else |
814 | static void numa_crng_init(void) {} | 821 | static void numa_crng_init(void) {} |
815 | #endif | 822 | #endif |