Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: fix usbled disconnect read race #2

usbled has a race where show methods for attributes in sysfs can
follow a NULL pointer during disconnect. The correct ordering fixes
it.

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>


authored by

Oliver Neukum and committed by
Greg Kroah-Hartman
ed206ec9 7ced46c3

+3 -1
+3 -1
drivers/usb/misc/usbled.c
··· 144 144 struct usb_led *dev; 145 145 146 146 dev = usb_get_intfdata (interface); 147 - usb_set_intfdata (interface, NULL); 148 147 149 148 device_remove_file(&interface->dev, &dev_attr_blue); 150 149 device_remove_file(&interface->dev, &dev_attr_red); 151 150 device_remove_file(&interface->dev, &dev_attr_green); 151 + 152 + /* first remove the files, then set the pointer to NULL */ 153 + usb_set_intfdata (interface, NULL); 152 154 153 155 usb_put_dev(dev->udev); 154 156