Skip to content

Commit 2fae9e5

Browse files
committed
usb: misc: legousbtower: Fix NULL pointer deference
This patch fixes a NULL pointer dereference caused by a race codition in the probe function of the legousbtower driver. It re-structures the probe function to only register the interface after successfully reading the board's firmware ID. The probe function does not deregister the usb interface after an error receiving the devices firmware ID. The device file registered (/dev/usb/legousbtower%d) may be read/written globally before the probe function returns. When tower_delete is called in the probe function (after an r/w has been initiated), core dev structures are deleted while the file operation functions are still running. If the 0 address is mappable on the machine, this vulnerability can be used to create a Local Priviege Escalation exploit via a write-what-where condition by remapping dev->interrupt_out_buffer in tower_write. A forged USB device and local program execution would be required for LPE. The USB device would have to delay the control message in tower_probe and accept the control urb in tower_open whilst guest code initiated a write to the device file as tower_delete is called from the error in tower_probe. This bug has existed since 2003. Patch tested by emulated device. Reported-by: James Patrick-Evans <james@jmp-e.com> Tested-by: James Patrick-Evans <james@jmp-e.com> Signed-off-by: James Patrick-Evans <james@jmp-e.com> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2ad9d54 commit 2fae9e5

File tree

1 file changed

+17
-18
lines changed

1 file changed

+17
-18
lines changed

Diff for: drivers/usb/misc/legousbtower.c

+17-18
Original file line numberDiff line numberDiff line change
@@ -886,24 +886,6 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device
886886
dev->interrupt_in_interval = interrupt_in_interval ? interrupt_in_interval : dev->interrupt_in_endpoint->bInterval;
887887
dev->interrupt_out_interval = interrupt_out_interval ? interrupt_out_interval : dev->interrupt_out_endpoint->bInterval;
888888

889-
/* we can register the device now, as it is ready */
890-
usb_set_intfdata (interface, dev);
891-
892-
retval = usb_register_dev (interface, &tower_class);
893-
894-
if (retval) {
895-
/* something prevented us from registering this driver */
896-
dev_err(idev, "Not able to get a minor for this device.\n");
897-
usb_set_intfdata (interface, NULL);
898-
goto error;
899-
}
900-
dev->minor = interface->minor;
901-
902-
/* let the user know what node this device is now attached to */
903-
dev_info(&interface->dev, "LEGO USB Tower #%d now attached to major "
904-
"%d minor %d\n", (dev->minor - LEGO_USB_TOWER_MINOR_BASE),
905-
USB_MAJOR, dev->minor);
906-
907889
/* get the firmware version and log it */
908890
result = usb_control_msg (udev,
909891
usb_rcvctrlpipe(udev, 0),
@@ -924,6 +906,23 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device
924906
get_version_reply.minor,
925907
le16_to_cpu(get_version_reply.build_no));
926908

909+
/* we can register the device now, as it is ready */
910+
usb_set_intfdata (interface, dev);
911+
912+
retval = usb_register_dev (interface, &tower_class);
913+
914+
if (retval) {
915+
/* something prevented us from registering this driver */
916+
dev_err(idev, "Not able to get a minor for this device.\n");
917+
usb_set_intfdata (interface, NULL);
918+
goto error;
919+
}
920+
dev->minor = interface->minor;
921+
922+
/* let the user know what node this device is now attached to */
923+
dev_info(&interface->dev, "LEGO USB Tower #%d now attached to major "
924+
"%d minor %d\n", (dev->minor - LEGO_USB_TOWER_MINOR_BASE),
925+
USB_MAJOR, dev->minor);
927926

928927
exit:
929928
return retval;

0 commit comments

Comments
 (0)