aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-02-02 09:36:01 -0500
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-02-08 08:45:09 -0500
commit005145378c9ad7575a01b6ce1ba118fb427f583a (patch)
treecbc6fb8c207d5f7dbc163819bd8d42a65504fb5b
parent430ae1261c511efe9fc6293fbf24b1f71ea8c4ea (diff)
[media] dvb-usb-v2: avoid use-after-free
I ran into a stack frame size warning because of the on-stack copy of the USB device structure: drivers/media/usb/dvb-usb-v2/dvb_usb_core.c: In function 'dvb_usbv2_disconnect': drivers/media/usb/dvb-usb-v2/dvb_usb_core.c:1029:1: error: the frame size of 1104 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] Copying a device structure like this is wrong for a number of other reasons too aside from the possible stack overflow. One of them is that the dev_info() call will print the name of the device later, but AFAICT we have only copied a pointer to the name earlier and the actual name has been freed by the time it gets printed. This removes the on-stack copy of the device and instead copies the device name using kstrdup(). I'm ignoring the possible failure here as both printk() and kfree() are able to deal with NULL pointers. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-rw-r--r--drivers/media/usb/dvb-usb-v2/dvb_usb_core.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
index 298c91a6f1f9..955fb0d07507 100644
--- a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
+++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
@@ -1012,8 +1012,8 @@ EXPORT_SYMBOL(dvb_usbv2_probe);
1012void dvb_usbv2_disconnect(struct usb_interface *intf) 1012void dvb_usbv2_disconnect(struct usb_interface *intf)
1013{ 1013{
1014 struct dvb_usb_device *d = usb_get_intfdata(intf); 1014 struct dvb_usb_device *d = usb_get_intfdata(intf);
1015 const char *name = d->name; 1015 const char *devname = kstrdup(dev_name(&d->udev->dev), GFP_KERNEL);
1016 struct device dev = d->udev->dev; 1016 const char *drvname = d->name;
1017 1017
1018 dev_dbg(&d->udev->dev, "%s: bInterfaceNumber=%d\n", __func__, 1018 dev_dbg(&d->udev->dev, "%s: bInterfaceNumber=%d\n", __func__,
1019 intf->cur_altsetting->desc.bInterfaceNumber); 1019 intf->cur_altsetting->desc.bInterfaceNumber);
@@ -1023,8 +1023,9 @@ void dvb_usbv2_disconnect(struct usb_interface *intf)
1023 1023
1024 dvb_usbv2_exit(d); 1024 dvb_usbv2_exit(d);
1025 1025
1026 dev_info(&dev, "%s: '%s' successfully deinitialized and disconnected\n", 1026 pr_info("%s: '%s:%s' successfully deinitialized and disconnected\n",
1027 KBUILD_MODNAME, name); 1027 KBUILD_MODNAME, drvname, devname);
1028 kfree(devname);
1028} 1029}
1029EXPORT_SYMBOL(dvb_usbv2_disconnect); 1030EXPORT_SYMBOL(dvb_usbv2_disconnect);
1030 1031