summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordan.carpenter@oracle.com <dan.carpenter@oracle.com>2020-01-15 20:46:28 +0300
committerJiri Kosina <jkosina@suse.cz>2020-02-12 14:46:56 +0100
commit5c02c447eaeda29d3da121a2e17b97ccaf579b51 (patch)
tree02a1c1bedb8f91014706175750a496fddb508bfe
parent84a4062632462c4320704fcdf8e99e89e94c0aba (diff)
downloadlinux-5c02c447eaeda29d3da121a2e17b97ccaf579b51.tar.gz
linux-5c02c447eaeda29d3da121a2e17b97ccaf579b51.tar.bz2
linux-5c02c447eaeda29d3da121a2e17b97ccaf579b51.zip
HID: hiddev: Fix race in in hiddev_disconnect()
Syzbot reports that "hiddev" is used after it's free in hiddev_disconnect(). The hiddev_disconnect() function sets "hiddev->exist = 0;" so hiddev_release() can free it as soon as we drop the "existancelock" lock. This patch moves the mutex_unlock(&hiddev->existancelock) until after we have finished using it. Reported-by: syzbot+784ccb935f9900cc7c9e@syzkaller.appspotmail.com Fixes: 7f77897ef2b6 ("HID: hiddev: fix potential use-after-free") Suggested-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/usbhid/hiddev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index a970b809d778..4140dea693e9 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -932,9 +932,9 @@ void hiddev_disconnect(struct hid_device *hid)
hiddev->exist = 0;
if (hiddev->open) {
- mutex_unlock(&hiddev->existancelock);
hid_hw_close(hiddev->hid);
wake_up_interruptible(&hiddev->wait);
+ mutex_unlock(&hiddev->existancelock);
} else {
mutex_unlock(&hiddev->existancelock);
kfree(hiddev);