Skip to contentSkip to conversation

Fix removable USB drive oops

PATCH Greg KH 2 participants 2 messages Mar 18, 2004 1 message not in the archive Driver core

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Greg KH

author
#1 lore raw
Quoted 7 lines · Linux Kernel Mailing List

ChangeSet 1.1623, 2004/03/13 13:48:36-05:00, [email protected]

[PATCH] Fix removable USB drive oops

The actual problem reported was because there wasn't a corresponding check on transport_classdev.class in the unregister.

Quoted 7 lines

However, on closer inspection I also turned up a nasty thinko in the reference counting. For reasons best known to the class code authors, class devices have to obtain their own references to the devices they're attached to which they release again in their .release routines, so you have to remember to do a get_device() in the correct place after the class_device_add(). I put comments in the code so that, hopefully, we can avoid the problem in future.

Bah, this was my fault, sorry.

Here's a patch that should fix this, and prevent you from needing this patch. Can you verify this?

thanks,

greg k-h

# Driver class: remove possible oops
#
# This happens when the device associated with a class device goes away before

# the class does.
drivers/base/class.c +2 -4
diff -Nru a/drivers/base/class.c b/drivers/base/class.c
@@ -155,8 +155,7 @@
 
 static void class_device_dev_unlink(struct class_device * class_dev)
 {
-	if (class_dev->dev)
-		sysfs_remove_link(&class_dev->kobj, "device");
+	sysfs_remove_link(&class_dev->kobj, "device");
 }
 
 static int class_device_driver_link(struct class_device * class_dev)
@@ -169,8 +168,7 @@
 
 static void class_device_driver_unlink(struct class_device * class_dev)
 {
-	if ((class_dev->dev) && (class_dev->dev->driver))
-		sysfs_remove_link(&class_dev->kobj, "driver");
+	sysfs_remove_link(&class_dev->kobj, "driver");
 }
 
 
#2 lore raw
Quoted 4 lines · Greg KH

Bah, this was my fault, sorry.

Here's a patch that should fix this, and prevent you from needing this patch. Can you verify this?

No, no. It was Martin's fault: He used a NULL class to indicate that we had no transport class.

The registration code in SCSI looks like:

	if (sdev->transport_classdev.class) {
		error = class_device_add(&sdev->transport_classdev);

i.e. only add the device if we actually have a transport class. The oops was caused because the unregister code was unconditional (i.e. unregister a device we never registered in the first place). The patch (among other things) makes it conditional on the sdev->transport_classdev.class like the registration.

James