Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

random: fix locking dependency with the tasklist_lock

Browse source 
Commit 6133705494 introduced a circular lock dependency because
posix_cpu_timers_exit() is called by release_task(), which is holding
a writer lock on tasklist_lock, and this can cause a deadlock since
kill_fasync() gets called with nonblocking_pool.lock taken.

There's no reason why kill_fasync() needs to be taken while the random
pool is locked, so move it out to fix this locking dependency.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reported-by: Russ Dill <Russ.Dill@gmail.com>
Cc: stable@kernel.org
This commit is contained in:
Theodore Ts'o 2013-03-04 11:59:12 -05:00 committed by followmsi
parent 89e3ba5431
commit db136ed6aa
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/char/random.c
View file

@ -879,6 +879,7 @@ static size_t account(struct entropy_store *r, size_t nbytes, int min,
int reserved) int reserved)
{ {
unsigned long flags; unsigned long flags;
int wakeup_write = 0;
/* Hold lock while accounting */ /* Hold lock while accounting */
spin_lock_irqsave(&r->lock, flags); spin_lock_irqsave(&r->lock, flags);
@ -908,10 +909,8 @@ retry:
goto retry; goto retry;
} }
if (entropy_count < random_write_wakeup_thresh) { if (entropy_count < random_write_wakeup_thresh)
wake_up_interruptible(&random_write_wait); wakeup_write = 1;
kill_fasync(&fasync, SIGIO, POLL_OUT);
}
} }
DEBUG_ENT("debiting %zu entropy credits from %s%s\n", DEBUG_ENT("debiting %zu entropy credits from %s%s\n",
@ -919,6 +918,11 @@ retry:
spin_unlock_irqrestore(&r->lock, flags); spin_unlock_irqrestore(&r->lock, flags);
if (wakeup_write) {
wake_up_interruptible(&random_write_wait);
kill_fasync(&fasync, SIGIO, POLL_OUT);
}
return nbytes; return nbytes;
} }