3.4-stable patches

added patches:
	mac80211-don-t-check-netdev-state-for-debugfs-read-write.patch

diff --git a/queue-3.4/mac80211-don-t-check-netdev-state-for-debugfs-read-write.patch b/queue-3.4/mac80211-don-t-check-netdev-state-for-debugfs-read-write.patch
new file mode 100644 (file)
index 0000000..1aab4b2
--- /dev/null
+++ b/queue-3.4/mac80211-don-t-check-netdev-state-for-debugfs-read-write.patch
@@ -0,0 +1,43 @@
+From 923eaf367206e01f22c97aee22300e332d071916 Mon Sep 17 00:00:00 2001
+From: Arik Nemtsov <arik@wizery.com>
+Date: Mon, 26 May 2014 14:40:51 +0300
+Subject: mac80211: don't check netdev state for debugfs read/write
+
+From: Arik Nemtsov <arik@wizery.com>
+
+commit 923eaf367206e01f22c97aee22300e332d071916 upstream.
+
+Doing so will lead to an oops for a p2p-dev interface, since it has
+no netdev.
+
+Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
+Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/mac80211/debugfs_netdev.c |    6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+--- a/net/mac80211/debugfs_netdev.c
++++ b/net/mac80211/debugfs_netdev.c
+@@ -33,8 +33,7 @@ static ssize_t ieee80211_if_read(
+       ssize_t ret = -EINVAL;
+ 
+       read_lock(&dev_base_lock);
+-      if (sdata->dev->reg_state == NETREG_REGISTERED)
+-              ret = (*format)(sdata, buf, sizeof(buf));
++      ret = (*format)(sdata, buf, sizeof(buf));
+       read_unlock(&dev_base_lock);
+ 
+       if (ret >= 0)
+@@ -61,8 +60,7 @@ static ssize_t ieee80211_if_write(
+ 
+       ret = -ENODEV;
+       rtnl_lock();
+-      if (sdata->dev->reg_state == NETREG_REGISTERED)
+-              ret = (*write)(sdata, buf, count);
++      ret = (*write)(sdata, buf, count);
+       rtnl_unlock();
+ 
+       return ret;

diff --git a/queue-3.4/series b/queue-3.4/series
index d7a484d29f55f51c9e965243f9262e22a2ebd99b..948eac5ffdb743efb879cc986eec829de6618eea 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -15,3 +15,4 @@ drm-radeon-atom-fix-dithering-on-certain-panels.patch
 drm-vmwgfx-fix-incorrect-write-to-read-only-register-v2.patch
 bluetooth-fix-ssp-acceptor-just-works-confirmation-without-mitm.patch
 bluetooth-remove-unused-hci_le_ltk_reply.patch
+mac80211-don-t-check-netdev-state-for-debugfs-read-write.patch