rpms/kernel/devel linux-2.6-mac80211-debugfs-stable-fix.patch, NONE, 1.1 kernel.spec, 1.1043, 1.1044

[John W. Linville]

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13832

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-mac80211-debugfs-stable-fix.patch 
Log Message:
-stable fix for mac80211 debugf-related panics

linux-2.6-mac80211-debugfs-stable-fix.patch:

--- NEW FILE linux-2.6-mac80211-debugfs-stable-fix.patch ---
>From johannes at sipsolutions.net Fri Oct 10 11:52:53 2008
Return-path: <johannes at sipsolutions.net>
Envelope-to: linville at tuxdriver.com
Delivery-date: Fri, 10 Oct 2008 11:52:53 -0400
Received: from xc.sipsolutions.net
	([83.246.72.84] helo=sipsolutions.net ident=Debian-exim)
	by smtp.tuxdriver.com with esmtps (TLSv1:AES256-SHA:256)
	(Exim 4.63)
	(envelope-from <johannes at sipsolutions.net>)
	id 1KoKIP-0005mi-6n
	for linville at tuxdriver.com; Fri, 10 Oct 2008 11:52:53 -0400
Received: by sipsolutions.net with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.69)
	(envelope-from <johannes at sipsolutions.net>)
	id 1KoKIM-0007dS-4T; Fri, 10 Oct 2008 17:52:50 +0200
Subject: [PATCH v2.6.27] mac80211: fix two issues in debugfs
From: Johannes Berg <johannes at sipsolutions.net>
To: stable <stable at kernel.org>
Cc: John Linville <linville at tuxdriver.com>, linux-wireless <linux-wireless at vger.kernel.org>
Content-Type: text/plain
Date: Fri, 10 Oct 2008 17:52:49 +0200
Message-Id: <1223653970.3748.23.camel at johannes.berg>
Mime-Version: 1.0
X-Mailer: Evolution 2.22.3.1 
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.0 (/)
X-Spam-Status: No
Status: RO
Content-Length: 1633
Lines: 51

This fixes RHBZ 466264, whenever the master interface is
renamed this code would BUG_ON. Also fixes a separately
reported bug with the debugfs dir being NULL.

This patch is not applicable to the next kernel version
because both these issues have been fixed, the first one
by not having the master interface have a ieee80211_ptr
at all, and the second one by also leaving the function
early.

Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Cc: John Linville <linville at tuxdriver.com>
---
 net/mac80211/debugfs_netdev.c |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

--- net-tx-2.6.orig/net/mac80211/debugfs_netdev.c	2008-10-10 17:46:50.000000000 +0200
+++ net-tx-2.6/net/mac80211/debugfs_netdev.c	2008-10-10 17:48:41.000000000 +0200
@@ -537,6 +537,7 @@ static int netdev_notify(struct notifier
 {
 	struct net_device *dev = ndev;
 	struct dentry *dir;
+	struct ieee80211_local *local;
 	struct ieee80211_sub_if_data *sdata;
 	char buf[10+IFNAMSIZ];
 
@@ -549,10 +550,19 @@ static int netdev_notify(struct notifier
 	if (dev->ieee80211_ptr->wiphy->privid != mac80211_wiphy_privid)
 		return 0;
 
-	sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	/*
+	 * Do not use IEEE80211_DEV_TO_SUB_IF because that
+	 * BUG_ONs for the master netdev which we need to
+	 * handle here.
+	 */
+	sdata = netdev_priv(dev);
 
-	sprintf(buf, "netdev:%s", dev->name);
 	dir = sdata->debugfsdir;
+
+	if (!dir)
+		return 0;
+
+	sprintf(buf, "netdev:%s", dev->name);
 	if (!debugfs_rename(dir->d_parent, dir, dir->d_parent, buf))
 		printk(KERN_ERR "mac80211: debugfs: failed to rename debugfs "
 		       "dir to %s\n", buf);






Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1043
retrieving revision 1.1044
diff -u -r1.1043 -r1.1044
--- kernel.spec	13 Oct 2008 16:44:10 -0000	1.1043
+++ kernel.spec	13 Oct 2008 18:01:35 -0000	1.1044
@@ -620,10 +620,9 @@
 Patch610: linux-2.6-defaults-fat-utf8.patch
 Patch670: linux-2.6-ata-quirk.patch
 
-Patch680: linux-2.6-wireless.patch
-Patch681: linux-2.6-wireless-pending.patch
-Patch682: linux-2.6-iwlwifi-use-dma_alloc_coherent.patch
-Patch683: linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch
+Patch680: linux-2.6-iwlwifi-use-dma_alloc_coherent.patch
+Patch681: linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch
+Patch682: linux-2.6-mac80211-debugfs-stable-fix.patch
 Patch690: linux-2.6-at76.patch
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
@@ -1173,15 +1172,12 @@
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 
-# wireless patches headed for 2.6.27
-#ApplyPatch linux-2.6-wireless.patch
-# wireless patches headed for 2.6.28
-#ApplyPatch linux-2.6-wireless-pending.patch
-
 # fix spot's iwlwifi, hopefully...
 ApplyPatch linux-2.6-iwlwifi-use-dma_alloc_coherent.patch
 # make jarod's iwl4965 not panic near N APs, hopefully
 ApplyPatch linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch
+# -stable fix for mac80211 debugf-related panics
+ApplyPatch linux-2.6-mac80211-debugfs-stable-fix.patch
 
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
@@ -1814,6 +1810,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Oct 13 2008 John W. Linville <linville at redhat.com>
+- -stable fix for mac80211 debugf-related panics
+
 * Mon Oct 13 2008 Eric Sandeen <sandeen at redhat.com>
 - Add fix for xfs root mount failure when some options are used.