OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8f75201
)
USB: chaoskey: fix use-after-free on release
author
Johan Hovold
<johan@kernel.org>
Wed, 9 Oct 2019 15:38:45 +0000
(17:38 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 17 Oct 2019 20:41:00 +0000
(13:41 -0700)
commit
93ddb1f56ae102f14f9e46a9a9c8017faa970003
upstream.
The driver was accessing its struct usb_interface in its release()
callback without holding a reference. This would lead to a
use-after-free whenever the device was disconnected while the character
device was still open.
Fixes:
66e3e591891d
("usb: Add driver for Altus Metrum ChaosKey device (v2)")
Cc: stable <stable@vger.kernel.org> # 4.1
Signed-off-by: Johan Hovold <johan@kernel.org>
Link:
https://lore.kernel.org/r/20191009153848.8664-3-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/misc/chaoskey.c
patch
|
blob
|
history
diff --git
a/drivers/usb/misc/chaoskey.c
b/drivers/usb/misc/chaoskey.c
index
23c7948
..
a369281
100644
(file)
--- a/
drivers/usb/misc/chaoskey.c
+++ b/
drivers/usb/misc/chaoskey.c
@@
-96,6
+96,7
@@
static void chaoskey_free(struct chaoskey *dev)
usb_dbg(dev->interface, "free");
kfree(dev->name);
kfree(dev->buf);
+ usb_put_intf(dev->interface);
kfree(dev);
}
@@
-144,6
+145,8
@@
static int chaoskey_probe(struct usb_interface *interface,
if (dev == NULL)
return -ENOMEM;
+ dev->interface = usb_get_intf(interface);
+
dev->buf = kmalloc(size, GFP_KERNEL);
if (dev->buf == NULL) {
@@
-169,8
+172,6
@@
static int chaoskey_probe(struct usb_interface *interface,
strcat(dev->name, udev->serial);
}
- dev->interface = interface;
-
dev->in_ep = in_ep;
dev->size = size;