1 files changed, 93 insertions, 0 deletions

diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.23/0024-mwifiex-fix-wrong-return-values-in-add_virtual_intf-.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.23/0024-mwifiex-fix-wrong-return-values-in-add_virtual_intf-.patch
new file mode 100644
index 00000000..e7cb513b
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.23/0024-mwifiex-fix-wrong-return-values-in-add_virtual_intf-.patch
@@ -0,0 +1,93 @@
+From 0b53b4fb097d5d599a3a3fcd0ac10ad140bdf9c4 Mon Sep 17 00:00:00 2001
+From: Bing Zhao <bzhao@marvell.com>
+Date: Tue, 3 Jul 2012 20:43:56 -0700
+Subject: [PATCH 24/49] mwifiex: fix wrong return values in add_virtual_intf()
+ error cases
+
+commit 858faa57dd9e2b91f3f870fbb1185982e42f5a2b upstream
+
+backported for linux-3.2.y, linux-3.3.y, linux-3.4.y
+
+add_virtual_intf() needs to return an ERR_PTR(), instead of NULL,
+on errors, otherwise cfg80211 will crash.
+
+Reported-by: Johannes Berg <johannes@sipsolutions.net>
+Signed-off-by: Bing Zhao <bzhao@marvell.com>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ drivers/net/wireless/mwifiex/cfg80211.c |   21 +++++++++------------
+ 1 file changed, 9 insertions(+), 12 deletions(-)
+
+diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
+index 462c710..01dcb1a 100644
+--- a/drivers/net/wireless/mwifiex/cfg80211.c
++++ b/drivers/net/wireless/mwifiex/cfg80211.c
+@@ -1177,11 +1177,11 @@ struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy,
+        void *mdev_priv;
+ 
+        if (!priv)
+-               return NULL;
++               return ERR_PTR(-EFAULT);
+ 
+        adapter = priv->adapter;
+        if (!adapter)
+-               return NULL;
++               return ERR_PTR(-EFAULT);
+ 
+        switch (type) {
+        case NL80211_IFTYPE_UNSPECIFIED:
+@@ -1190,7 +1190,7 @@ struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy,
+                if (priv->bss_mode) {
+                        wiphy_err(wiphy, "cannot create multiple"
+                                        " station/adhoc interfaces\n");
+-                       return NULL;
++                       return ERR_PTR(-EINVAL);
+                }
+ 
+                if (type == NL80211_IFTYPE_UNSPECIFIED)
+@@ -1208,14 +1208,15 @@ struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy,
+                break;
+        default:
+                wiphy_err(wiphy, "type not supported\n");
+-               return NULL;
++               return ERR_PTR(-EINVAL);
+        }
+ 
+        dev = alloc_netdev_mq(sizeof(struct mwifiex_private *), name,
+                              ether_setup, 1);
+        if (!dev) {
+                wiphy_err(wiphy, "no memory available for netdevice\n");
+-               goto error;
++               priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
++               return ERR_PTR(-ENOMEM);
+        }
+ 
+        dev_net_set(dev, wiphy_net(wiphy));
+@@ -1240,7 +1241,9 @@ struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy,
+        /* Register network device */
+        if (register_netdevice(dev)) {
+                wiphy_err(wiphy, "cannot register virtual network device\n");
+-               goto error;
++               free_netdev(dev);
++               priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
++               return ERR_PTR(-EFAULT);
+        }
+ 
+        sema_init(&priv->async_sem, 1);
+@@ -1252,12 +1255,6 @@ struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy,
+        mwifiex_dev_debugfs_init(priv);
+ #endif
+        return dev;
+-error:
+-       if (dev && (dev->reg_state == NETREG_UNREGISTERED))
+-               free_netdev(dev);
+-       priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
+-
+-       return NULL;
+ }
+ EXPORT_SYMBOL_GPL(mwifiex_add_virtual_intf);
+ 
+-- 
+1.7.10
+