summaryrefslogtreecommitdiff
path: root/drivers/usb/misc
diff options
context:
space:
mode:
authorPete Zaitcev <zaitcev@redhat.com>2019-12-05 05:39:41 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-10 13:41:20 +0300
commit19e6317d24c25ee737c65d1ffb7483bdda4bb54a (patch)
treea57715f97ba4168660e2a24672fe3968cf56a7ca /drivers/usb/misc
parent59120962e4be4f72be537adb17da6881c4b3797c (diff)
downloadlinux-19e6317d24c25ee737c65d1ffb7483bdda4bb54a.tar.xz
usb: mon: Fix a deadlock in usbmon between mmap and read
The problem arises because our read() function grabs a lock of the circular buffer, finds something of interest, then invokes copy_to_user() straight from the buffer, which in turn takes mm->mmap_sem. In the same time, the callback mon_bin_vma_fault() is invoked under mm->mmap_sem. It attempts to take the fetch lock and deadlocks. This patch does away with protecting of our page list with any semaphores, and instead relies on the kernel not close the device while mmap is active in a process. In addition, we prohibit re-sizing of a buffer while mmap is active. This way, when (now unlocked) fault is processed, it works with the page that is intended to be mapped-in, and not some other random page. Note that this may have an ABI impact, but hopefully no legitimate program is this wrong. Signed-off-by: Pete Zaitcev <zaitcev@redhat.com> Reported-by: syzbot+56f9673bb4cdcbeb0e92@syzkaller.appspotmail.com Reviewed-by: Alan Stern <stern@rowland.harvard.edu> Fixes: 46eb14a6e158 ("USB: fix usbmon BUG trigger") Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20191204203941.3503452b@suzdal.zaitcev.lan Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/misc')
0 files changed, 0 insertions, 0 deletions