diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2016-01-26 11:29:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-03 15:06:53 -0800 |
| commit | 24ff5178f249a562174cfc339ac4439a436dab04 (patch) | |
| tree | 624f16ab22cc0c5e7dbd43b6a3ba5b58fe87ec21 /net/rfkill/core.c | |
| parent | 2d9db494ab05a1cec2d3ab1daab610e023cff75a (diff) | |
| download | lwn-24ff5178f249a562174cfc339ac4439a436dab04.tar.gz lwn-24ff5178f249a562174cfc339ac4439a436dab04.zip | |
rfkill: fix rfkill_fop_read wait_event usage
commit 6736fde9672ff6717ac576e9bba2fd5f3dfec822 upstream.
The code within wait_event_interruptible() is called with
!TASK_RUNNING, so mustn't call any functions that can sleep,
like mutex_lock().
Since we re-check the list_empty() in a loop after the wait,
it's safe to simply use list_empty() without locking.
This bug has existed forever, but was only discovered now
because all userspace implementations, including the default
'rfkill' tool, use poll() or select() to get a readable fd
before attempting to read.
Fixes: c64fb01627e24 ("rfkill: create useful userspace interface")
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/rfkill/core.c')
| -rw-r--r-- | net/rfkill/core.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/net/rfkill/core.c b/net/rfkill/core.c index e23326bbcc4e..4b9dc2460772 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -1078,17 +1078,6 @@ static unsigned int rfkill_fop_poll(struct file *file, poll_table *wait) return res; } -static bool rfkill_readable(struct rfkill_data *data) -{ - bool r; - - mutex_lock(&data->mtx); - r = !list_empty(&data->events); - mutex_unlock(&data->mtx); - - return r; -} - static ssize_t rfkill_fop_read(struct file *file, char __user *buf, size_t count, loff_t *pos) { @@ -1105,8 +1094,11 @@ static ssize_t rfkill_fop_read(struct file *file, char __user *buf, goto out; } mutex_unlock(&data->mtx); + /* since we re-check and it just compares pointers, + * using !list_empty() without locking isn't a problem + */ ret = wait_event_interruptible(data->read_wait, - rfkill_readable(data)); + !list_empty(&data->events)); mutex_lock(&data->mtx); if (ret) |