Commit 73c4e2ed authored Mar 14, 2017 by Johan Hovold Committed by Greg Kroah-Hartman Mar 30, 2017

USB: usbtmc: add missing endpoint sanity check

commit 687e0687f71ec00e0132a21fef802dee88c2f1ad upstream.

USBTMC devices are required to have a bulk-in and a bulk-out endpoint,
but the driver failed to verify this, something which could lead to the
endpoint addresses being taken from uninitialised memory.

Make sure to zero all private data as part of allocation, and add the
missing endpoint sanity check.

Note that this also addresses a more recently introduced issue, where
the interrupt-in-presence flag would also be uninitialised whenever the
optional interrupt-in endpoint is not present. This in turn could lead
to an interrupt urb being allocated, initialised and submitted based on
uninitialised values.

Fixes: dbf3e7f6 ("Implement an ioctl to support the USMTMC-USB488 READ_STATUS_BYTE operation.")
Fixes: 5b775f67 ("USB: add USB test and measurement class driver")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 4e615886

drivers/usb/class/usbtmc.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -1380,7 +1380,7 @@ static int usbtmc_probe(struct usb_interface *intf,

		dev_dbg(&intf->dev, "%s called\n", __func__);

		data = kmalloc(sizeof(*data), GFP_KERNEL);
		data = kzalloc(sizeof(*data), GFP_KERNEL);
		if (!data)
		return -ENOMEM;

		@@ -1443,6 +1443,13 @@ static int usbtmc_probe(struct usb_interface *intf,
		break;
		}
		}

		if (!data->bulk_out \|\| !data->bulk_in) {
		dev_err(&intf->dev, "bulk endpoints not found\n");
		retcode = -ENODEV;
		goto err_put;
		}

		/* Find int endpoint */
		for (n = 0; n < iface_desc->desc.bNumEndpoints; n++) {
		endpoint = &iface_desc->endpoint[n].desc;
		@@ -1511,6 +1518,7 @@ static int usbtmc_probe(struct usb_interface *intf,
		sysfs_remove_group(&intf->dev.kobj, &capability_attr_grp);
		sysfs_remove_group(&intf->dev.kobj, &data_attr_grp);
		usbtmc_free_int(data);
		err_put:
		kref_put(&data->kref, usbtmc_delete);
		return retcode;
		}