evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

USB: chaoskey: fix use-after-free on release

Browse source 
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: 66e3e59189 ("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>
This commit is contained in:
Johan Hovold 2019-10-09 17:38:45 +02:00 • committed by Greg Kroah-Hartman
parent 8f75201338
commit ebfb3be3b0
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/usb/misc/chaoskey.c
View file

@ -96,6 +96,7 @@ static void chaoskey_free(struct chaoskey *dev)
usb_dbg(dev->interface, "free"); usb_dbg(dev->interface, "free");
kfree(dev->name); kfree(dev->name);
kfree(dev->buf); kfree(dev->buf);
usb_put_intf(dev->interface);
kfree(dev); kfree(dev);
} }
@ -144,6 +145,8 @@ static int chaoskey_probe(struct usb_interface *interface,
if (dev == NULL) if (dev == NULL)
return -ENOMEM; return -ENOMEM;
dev->interface = usb_get_intf(interface);
dev->buf = kmalloc(size, GFP_KERNEL); dev->buf = kmalloc(size, GFP_KERNEL);
if (dev->buf == NULL) { if (dev->buf == NULL) {
@ -169,8 +172,6 @@ static int chaoskey_probe(struct usb_interface *interface,
strcat(dev->name, udev->serial); strcat(dev->name, udev->serial);
} }
dev->interface = interface;
dev->in_ep = in_ep; dev->in_ep = in_ep;
dev->size = size; dev->size = size;