Skip to contentSkip to conversation

Prevent sysfs-related oops in pcmcia class code

PATCH New Russell King 1 participant 1 message Jun 15, 2003 Pcmcia

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Prevent sysfs-related oops in pcmcia class code

Although no such oops has been reported, removing a socket driver while a file under /sysfs/class/pcmcia_socket/pcmcia_socket* is held open by user space could potentially cause an oops.

Plug this by preventing pcmcia_unregister_socket from returning until all references by sysfs to the pcmcia socket have been dropped.

This patch is against my current bk tree, so will apply with offsets to 2.5.71.

drivers/pcmcia/cs.c +12 -0
diff -Nru a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
@@ -387,6 +387,12 @@
 	socket->ss_entry = NULL;
 }
 
+static void pcmcia_release_socket(struct class_device *class_dev)
+{
+	struct pcmcia_socket *socket = class_get_devdata(class_dev);
+	complete(&socket->socket_released);
+}
+
 
 /**
  * pcmcia_register_socket - add a new pcmcia socket device
@@ -450,6 +456,8 @@
 
 	DEBUG(0, "cs: pcmcia_unregister_socket(0x%p)\n", socket->ss_entry);
 
+	init_completion(&socket->socket_released);
+
 	/* remove from the device core */
 	class_device_unregister(&socket->dev);
 
@@ -457,6 +465,9 @@
 	down_write(&pcmcia_socket_list_rwsem);
 	list_del(&socket->socket_list);
 	up_write(&pcmcia_socket_list_rwsem);
+
+	/* wait for sysfs to drop all references */
+	wait_for_completion(&socket->socket_released);
 } /* pcmcia_unregister_socket */
 EXPORT_SYMBOL(pcmcia_unregister_socket);
 
@@ -2496,6 +2507,7 @@
 
 struct class pcmcia_socket_class = {
 	.name = "pcmcia_socket",
+	.release = pcmcia_release_socket,
 };
 EXPORT_SYMBOL(pcmcia_socket_class);
 
include/pcmcia/ss.h +1 -0
diff -Nru a/include/pcmcia/ss.h b/include/pcmcia/ss.h
@@ -193,6 +193,7 @@
 	char				*fake_cis;
 
 	struct list_head		socket_list;
+	struct completion		socket_released;
 
  	/* deprecated */
 	unsigned int			sock;		/* socket number */
Signature · 2 lines
Russell King ([email protected])                The developer of ARM Linux
             http://www.arm.linux.org.uk/personal/aboutme.html