This is a note to let you know that we have just queued up the patch titled
Subject: mac80211: fix two issues in debugfs
to the 2.6.27-stable tree. Its filename is
mac80211-fix-two-issues-in-debugfs.patch
A git repo of this tree can be found at
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>From johannes@xxxxxxxxxxxxxxxx Wed Oct 15 14:25:41 2008
From: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Fri, 10 Oct 2008 17:52:49 +0200
Subject: mac80211: fix two issues in debugfs
To: stable <stable@xxxxxxxxxx>
Cc: linux-wireless <linux-wireless@xxxxxxxxxxxxxxx>, John Linville <linville@xxxxxxxxxxxxx>
Message-ID: <1223653970.3748.23.camel@xxxxxxxxxxxxx>
From: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Not in trees above 2.6.27 as it is fixed differently in .28.
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@xxxxxxxxxxxxxxxx>
Cc: John Linville <linville@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
net/mac80211/debugfs_netdev.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -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);
Patches currently in stable-queue which might be from johannes@xxxxxxxxxxxxxxxx are
queue-2.6.27/mac80211-fix-two-issues-in-debugfs.patch
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
