]> www.infradead.org Git - users/jedix/linux-maple.git/commit
rfkill: fix rfkill_fop_read wait_event usage
authorJohannes Berg <johannes.berg@intel.com>
Tue, 26 Jan 2016 10:29:03 +0000 (11:29 +0100)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 26 May 2016 22:44:37 +0000 (15:44 -0700)
commit088d2d3fb1720c0033ca9988ab5a4c5035c2f8c1
treeb10cfc213affe8f8b4c4877ac404c2c21a485a4c
parenta06bbfd0390f21c61f612620e002b8f92adf6734
rfkill: fix rfkill_fop_read wait_event usage

Orabug: 23330795

[ Upstream commit 6736fde9672ff6717ac576e9bba2fd5f3dfec822 ]

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.

Cc: stable@vger.kernel.org
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: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 5abd25f01c03b52d8aa39813656782917aa10d9b)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
net/rfkill/core.c