usb: misc: legousbtower: Fix NULL pointer deference
Subsystems (3)
PATCH 1/1 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.
---drivers/usb/misc/legousbtower.c | 35 +++++++++++++++++------------------
1 file changed, 17 insertions(+), 18 deletions(-)
drivers/usb/misc/legousbtower.c +17 -18
@@ -898,24 +898,6 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device dev->interrupt_in_interval = interrupt_in_interval ? interrupt_in_interval : dev->interrupt_in_endpoint->bInterval; dev->interrupt_out_interval = interrupt_out_interval ? interrupt_out_interval : dev->interrupt_out_endpoint->bInterval; -/* we can register the device now, as it is ready */ -usb_set_intfdata (interface, dev); - - retval =usb_register_dev (interface, &tower_class); - -if (retval) { -/* something prevented us from registering this driver */ -dev_err (idev,"Not able to get a minor for this device.\n" ); -usb_set_intfdata (interface,NULL ); - goto error; - } - dev->minor = interface->minor; - -/* let the user know what node this device is now attached to */ -dev_info (&interface->dev,"LEGO USB Tower #%d now attached to major " -"%d minor %d\n" , (dev->minor -LEGO_USB_TOWER_MINOR_BASE ), -USB_MAJOR , dev->minor); -/* get the firmware version and log it */ result = usb_control_msg (udev, usb_rcvctrlpipe(udev, 0),
@@ -936,6 +918,23 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device get_version_reply.minor, le16_to_cpu(get_version_reply.build_no)); +/* we can register the device now, as it is ready */ +usb_set_intfdata (interface, dev); + + retval =usb_register_dev (interface, &tower_class); + +if (retval) { +/* something prevented us from registering this driver */ +dev_err (idev,"Not able to get a minor for this device.\n" ); +usb_set_intfdata (interface,NULL ); + goto error; + } + dev->minor = interface->minor; + +/* let the user know what node this device is now attached to */ +dev_info (&interface->dev,"LEGO USB Tower #%d now attached to major " +"%d minor %d\n" , (dev->minor -LEGO_USB_TOWER_MINOR_BASE ), +USB_MAJOR , dev->minor);
exit:
return retval;
--
Greg KH
maintainerQuoted 19 lines · James
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_deleteis 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 remappingdev->interrupt_out_bufferintower_write. A forged USB device and local program execution would be required for LPE. The USB
device would have to delay the control message intower_probeand accept the control urb intower_openwhilst guest code initiated a write to the device file astower_deleteis called from the error intower_probe.
Quoted 6 lines
This bug has existed since 2003. Patch tested by emulated device.
Signed-off-by James Patrick-Evans <[email protected]>---
drivers/usb/misc/legousbtower.c| 35 +++++++++++++++++------------------1 file changed, 17 insertions(+), 18 deletions(-)
When you sent this the last time (back on Sept 2), I sent you a "simpler" patch, the same one below, and asked you if that worked instead. I never heard back, could you test this patch and see if it resolves the issue for you?
thanks,
greg k-h
---------------
How about this simpler patch, that moves the registering for the minor number as the last thing that happens in the probe function (which is what it should be).
Can you test this to verify it prevents the above problem?
And this driver really needs an overhaul one of these days...
thanks,
greg k-h
drivers/usb/misc/legousbtower.c +17 -18
@@ -898,24 +898,6 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device dev->interrupt_in_interval = interrupt_in_interval ? interrupt_in_interval : dev->interrupt_in_endpoint->bInterval; dev->interrupt_out_interval = interrupt_out_interval ? interrupt_out_interval : dev->interrupt_out_endpoint->bInterval; -/* we can register the device now, as it is ready */ -usb_set_intfdata (interface, dev); - - retval =usb_register_dev (interface, &tower_class); - -if (retval) { -/* something prevented us from registering this driver */ -dev_err (idev,"Not able to get a minor for this device.\n" ); -usb_set_intfdata (interface,NULL ); - goto error; - } - dev->minor = interface->minor; - -/* let the user know what node this device is now attached to */ -dev_info (&interface->dev,"LEGO USB Tower #%d now attached to major " -"%d minor %d\n" , (dev->minor -LEGO_USB_TOWER_MINOR_BASE ), -USB_MAJOR , dev->minor); -/* get the firmware version and log it */ result = usb_control_msg (udev, usb_rcvctrlpipe(udev, 0),
@@ -936,6 +918,23 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device get_version_reply.minor, le16_to_cpu(get_version_reply.build_no)); +/* we can register the device now, as it is ready */ +usb_set_intfdata (interface, dev); + + retval =usb_register_dev (interface, &tower_class); + +if (retval) { +/* something prevented us from registering this driver */ +dev_err (idev,"Not able to get a minor for this device.\n" ); +usb_set_intfdata (interface,NULL ); + goto error; + } + dev->minor = interface->minor; + +/* let the user know what node this device is now attached to */ +dev_info (&interface->dev,"LEGO USB Tower #%d now attached to major " +"%d minor %d\n" , (dev->minor -LEGO_USB_TOWER_MINOR_BASE ), +USB_MAJOR , dev->minor); exit:return retval;
Quoted 4 lines · Greg KH
When you sent this the last time (back on Sept 2), I sent you a "simpler" patch, the same one below, and asked you if that worked instead. I never heard back, could you test this patch and see if it resolves the issue for you?
As far as I can tell, your patches are identical.
Regards
Oliver
Greg KH
maintainerQuoted 7 lines · Oliver Neukum
Quoted 4 lines · Greg KH
When you sent this the last time (back on Sept 2), I sent you a "simpler" patch, the same one below, and asked you if that worked instead. I never heard back, could you test this patch and see if it resolves the issue for you?
As far as I can tell, your patches are identical.
Hah, so they are. James's original patch was not this one, sorry for not looking at it closer.
James, any reason why you are passing off my patch as yours here? Did you test mine and see that this did solve the problem? You did change your changelog text a bit, to reflect the change between mine and yours, so I'm guessing that you did?
thanks,
greg k-h
Hi greg,
Many appologies, I did not see your patch attached/forgot it
existed when I fixed this yesterday. I created this patch based on your
feedback from my original email on September 2nd. I have tested this patch with an emulated device and it fixes the vulnerability. Again, applogies for the long delay and patch confusion.
Best regards,
James
Quoted 20 lines · Greg KH
Quoted 7 lines · Oliver Neukum
Quoted 4 lines · Greg KH
When you sent this the last time (back on Sept 2), I sent you a "simpler" patch, the same one below, and asked you if that worked instead. I never heard back, could you test this patch and see if it resolves the issue for you?
As far as I can tell, your patches are identical.
Hah, so they are. James's original patch was not this one, sorry for not looking at it closer.
James, any reason why you are passing off my patch as yours here? Did you test mine and see that this did solve the problem? You did change your changelog text a bit, to reflect the change between mine and yours, so I'm guessing that you did?
thanks,
greg k-h
Greg KH
maintainerQuoted 7 lines · James
Hi greg,
Many appologies, I did not see your patch attached/forgot it existed when I
fixed this yesterday. I created this patch based on your
feedback from my original email on September 2nd. I have tested this patch with an emulated device and it fixes the vulnerability.
Again, applogies for the long delay and patch confusion.
Heh, my feedback contained the patch itself, so it might have been hard to miss it :)
Anyway, I'll queue this up later today, thanks for the report, and testing, much appreciated.
greg k-h
Greg KH
maintainerQuoted 83 lines · James
From: Greg Kroah-Hartman <[email protected]>
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_deleteis 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 remappingdev->interrupt_out_bufferintower_write. A forged USB device and local program execution would be required for LPE. The USB
device would have to delay the control message intower_probeand accept the control urb intower_openwhilst guest code initiated a write to the device file astower_deleteis called from the error intower_probe.This bug has existed since 2003. Patch tested by emulated device.
Reported-by James Patrick-Evans <[email protected]>Tested-by James Patrick-Evans <[email protected]>Signed-off-by James Patrick-Evans <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>---
drivers/usb/misc/legousbtower.c| 35 +++++++++++++++++------------------1 file changed, 17 insertions(+), 18 deletions(-)drivers/usb/misc/legousbtower.c +17
-18@@ -898,24 +898,6 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device dev->interrupt_in_interval = interrupt_in_interval ? interrupt_in_interval : dev->interrupt_in_endpoint->bInterval; dev->interrupt_out_interval = interrupt_out_interval ? interrupt_out_interval : dev->interrupt_out_endpoint->bInterval; -/* we can register the device now, as it is ready */ -usb_set_intfdata (interface, dev); - - retval =usb_register_dev (interface, &tower_class); - -if (retval) { -/* something prevented us from registering this driver */ -dev_err (idev,"Not able to get a minor for this device.\n" ); -usb_set_intfdata (interface,NULL ); - goto error; - } - dev->minor = interface->minor; - -/* let the user know what node this device is now attached to */ -dev_info (&interface->dev,"LEGO USB Tower #%d now attached to major " -"%d minor %d\n" , (dev->minor -LEGO_USB_TOWER_MINOR_BASE ), -USB_MAJOR , dev->minor); -/* get the firmware version and log it */ result = usb_control_msg (udev, usb_rcvctrlpipe(udev, 0),@@ -936,6 +918,23 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device get_version_reply.minor, le16_to_cpu(get_version_reply.build_no)); +/* we can register the device now, as it is ready */ +usb_set_intfdata (interface, dev); + + retval =usb_register_dev (interface, &tower_class); + +if (retval) { +/* something prevented us from registering this driver */ +dev_err (idev,"Not able to get a minor for this device.\n" ); +usb_set_intfdata (interface,NULL ); + goto error; + } + dev->minor = interface->minor; + +/* let the user know what node this device is now attached to */ +dev_info (&interface->dev,"LEGO USB Tower #%d now attached to major " +"%d minor %d\n" , (dev->minor -LEGO_USB_TOWER_MINOR_BASE ), +USB_MAJOR , dev->minor);exit:
Quoted 2 lines
return retval;--
Ugh, all of the tabs got turned into spaces, next time be more careful with your email client :(
thanks,
greg k-h