ieee1394: dv1394: fix possible deadlock in multithreaded clients
PATCH 1/1 ieee1394: dv1394: fix possible deadlock in multithreaded clients
In reply to a message not in the archiveFix a possible though highly unlikely deadlock:
Thread A: Thread B:
- acquire mmap_sem - dv1394_ioctl/read/write() - dv1394_mmap() - acquire video->mtx - acquire video->mtx - copy_to/from_user(), possible page fault:
acquire mmap_sem
The simplest fix is to use mutex_trylock() instead of mutex_lock() in dv1394_mmap(). This changes the behavior under contention in a way which is visible to userspace clients. However, my guess is that no clients exist which use mmap vs. ioctl/read/write on the dv1394 character device file interface in concurrent threads.
Reported-by Johannes Weiner <[email protected]>
Signed-off-by Stefan Richter <[email protected]>
--- drivers/ieee1394/dv1394.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/ieee1394/dv1394.c +8 -2
@@ -1270,8 +1270,14 @@ static int dv1394_mmap(struct file *filestruct video_card *video =file_to_video_card (file);int retval = -EINVAL ; -/* serialize mmap */ -mutex_lock (&video->mtx); +/* +* We cannot use the blocking variant mutex_lock here because .mmap +* is called with mmap_sem held, while .ioctl, .read, .write acquire +* video->mtx and subsequently call copy_to/from_user which will +* grab mmap_sem in case of a page fault. +*/ +if (!mutex_trylock (&video->mtx)) +return -EAGAIN ;if ( !video_card_initialized (video) ) { retval =do_dv1394_init_default (video);
Signature · 3 lines
Stefan Richter -=====-==--- =-=- ==-=- http://arcgraph.de/sr/