diff options
| author | Rabin Vincent <rabin.vincent@stericsson.com> | 2012-02-22 15:58:00 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-24 12:03:14 -0800 |
| commit | 47de87a234aac8b2121557f3903bb16bb678af67 (patch) | |
| tree | cd537ccb1da065bccc0d16b8396c9f50f89c1db8 /drivers/staging/android | |
| parent | 6f6c4dc040a6b4cbed02a57a78f5d08a86d84a38 (diff) | |
staging: logger: hold mutex while removing reader
The readers list is traversed under the log->mutex lock
(for example from fix_up_readers()), but the deletion of
elements from this list is not being done under this lock.
Cc: Brian Swetland <swetland@google.com>
Cc: Dima Zavin <dima@android.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android')
| -rw-r--r-- | drivers/staging/android/logger.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c index 0d2367f2c15f..ea69b6a77dac 100644 --- a/drivers/staging/android/logger.c +++ b/drivers/staging/android/logger.c @@ -459,7 +459,12 @@ static int logger_release(struct inode *ignored, struct file *file) { if (file->f_mode & FMODE_READ) { struct logger_reader *reader = file->private_data; + struct logger_log *log = reader->log; + + mutex_lock(&log->mutex); list_del(&reader->list); + mutex_unlock(&log->mutex); + kfree(reader); } |