hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

w1: do not unlock unheld list_mutex in __w1_remove_master_device() 

w1_process_callbacks() expects to be called with dev->list_mutex held,
but it is the fact only in w1_process(). __w1_remove_master_device()
calls w1_process_callbacks() after it releases list_mutex.

The patch fixes __w1_remove_master_device() to acquire list_mutex
for w1_process_callbacks().

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: David Fries <david@fries.net>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Cc: stable <stable@vger.kernel.org> # 3.15
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexey Khoroshilov 2014-05-07 01:26:04 +04:00 committed by Greg Kroah-Hartman
parent 8a0427d192
commit a0f104644e
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/w1/w1.c
View File

@ -1078,6 +1078,8 @@ static void w1_search_process(struct w1_master *dev, u8 search_type)
* w1_process_callbacks() - execute each dev->async_list callback entry * w1_process_callbacks() - execute each dev->async_list callback entry
* @dev: w1_master device * @dev: w1_master device
* *
* The w1 master list_mutex must be held.
*
* Return: 1 if there were commands to executed 0 otherwise * Return: 1 if there were commands to executed 0 otherwise
*/ */
int w1_process_callbacks(struct w1_master *dev) int w1_process_callbacks(struct w1_master *dev)

4
drivers/w1/w1_int.c
View File

@ -219,9 +219,13 @@ void __w1_remove_master_device(struct w1_master *dev)
if (msleep_interruptible(1000)) if (msleep_interruptible(1000))
flush_signals(current); flush_signals(current);
mutex_lock(&dev->list_mutex);
w1_process_callbacks(dev); w1_process_callbacks(dev);
mutex_unlock(&dev->list_mutex);
} }
mutex_lock(&dev->list_mutex);
w1_process_callbacks(dev); w1_process_callbacks(dev);
mutex_unlock(&dev->list_mutex);
memset(&msg, 0, sizeof(msg)); memset(&msg, 0, sizeof(msg));
msg.id.mst.id = dev->id; msg.id.mst.id = dev->id;