Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d718d2b1 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

USB: fix read vs. disconnect race in cytherm driver 



the disconnect method of this driver set intfdata to NULL before
removing attribute files. The attributes' read methods will happily
follow the NULL pointer. Here's the correct ordering.

Signed-off-by : Oliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 54d2bc06

drivers/usb/misc/cytherm.c

+3 −1
Original line number Diff line number Diff line
@@ -399,7 +399,6 @@ static void cytherm_disconnect(struct usb_interface *interface) 
	struct usb_cytherm *dev;



	dev = usb_get_intfdata (interface);

	usb_set_intfdata (interface, NULL);



	device_remove_file(&interface->dev, &dev_attr_brightness);

	device_remove_file(&interface->dev, &dev_attr_temp);
@@ -407,6 +406,9 @@ static void cytherm_disconnect(struct usb_interface *interface) 
	device_remove_file(&interface->dev, &dev_attr_port0);

	device_remove_file(&interface->dev, &dev_attr_port1);



	/* first remove the files, then NULL the pointer */

	usb_set_intfdata (interface, NULL);



	usb_put_dev(dev->udev);



	kfree(dev);