[PATCH] sysfs -- don't crash if removing non-existant attribute group

From: Stephen Hemminger <shemminger@osdl.org>
To: Patrick Mochel <mochel@osdl.org>
Cc: "David S. Miller" <davem@redhat.com>,
	Martin Josefsson <gandalf@wlug.westbo.se>,
	linux-kernel@vger.kernel.org
Subject: [PATCH] sysfs -- don't crash if removing non-existant attribute group
Date: Mon, 13 Oct 2003 16:25:59 -0700	[thread overview]
Message-ID: <20031013162559.5ff55929.shemminger@osdl.org> (raw)
In-Reply-To: <20031003224931.57ac536a.davem@redhat.com>

Some (buggy) network drivers in 2.6 decide to set the statistics hook,
after registration. This causes unregister_netdevice to crash because it attempts 
to remove the 'statistics' attribute group it thought was created.  

This fixes sysfs so it ignores the problem.  Another set of patches
will address the remaining buggy ether drivers.

diff -Nru a/fs/sysfs/group.c b/fs/sysfs/group.c

--- a/fs/sysfs/group.c	Mon Oct 13 16:04:31 2003
+++ b/fs/sysfs/group.c	Mon Oct 13 16:04:31 2003
@@ -65,9 +65,11 @@
 {
 	struct dentry * dir;
 
-	if (grp->name)
+	if (grp->name) {
 		dir = sysfs_get_dentry(kobj->dentry,grp->name);
-	else
+		if (dir == NULL)	/* non-existent */
+			return;
+	} else
 		dir = kobj->dentry;
 
 	remove_files(dir,grp);
