wlan: Protect add get and set_default key functions from SSR
Protect add get and set default key cfg80211 functions from
accessing deallocated/unitialized data structures while SSR
is in progress.
Change-Id: I7e8a8aebb9bea80cf2f6795c2e8da4e9863b7d10
CRs-Fixed: 673987
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 827a2e4..9f98e91 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -4956,18 +4956,18 @@
}
/*
- * FUNCTION: wlan_hdd_cfg80211_add_key
+ * FUNCTION: __wlan_hdd_cfg80211_add_key
* This function is used to initialize the key information
*/
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
-static int wlan_hdd_cfg80211_add_key( struct wiphy *wiphy,
+static int __wlan_hdd_cfg80211_add_key( struct wiphy *wiphy,
struct net_device *ndev,
u8 key_index, bool pairwise,
const u8 *mac_addr,
struct key_params *params
)
#else
-static int wlan_hdd_cfg80211_add_key( struct wiphy *wiphy,
+static int __wlan_hdd_cfg80211_add_key( struct wiphy *wiphy,
struct net_device *ndev,
u8 key_index, const u8 *mac_addr,
struct key_params *params
@@ -5325,12 +5325,41 @@
return 0;
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
+static int wlan_hdd_cfg80211_add_key( struct wiphy *wiphy,
+ struct net_device *ndev,
+ u8 key_index, bool pairwise,
+ const u8 *mac_addr,
+ struct key_params *params
+ )
+#else
+static int wlan_hdd_cfg80211_add_key( struct wiphy *wiphy,
+ struct net_device *ndev,
+ u8 key_index, const u8 *mac_addr,
+ struct key_params *params
+ )
+#endif
+{
+ int ret;
+ vos_ssr_protect(__func__);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
+ ret = __wlan_hdd_cfg80211_add_key(wiphy, ndev, key_index, pairwise,
+ mac_addr, params);
+#else
+ ret = __wlan_hdd_cfg80211_add_key(wiphy, ndev, key_index, mac_addr,
+ params);
+#endif
+ vos_ssr_unprotect(__func__);
+
+ return ret;
+}
+
/*
- * FUNCTION: wlan_hdd_cfg80211_get_key
+ * FUNCTION: __wlan_hdd_cfg80211_get_key
* This function is used to get the key information
*/
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
-static int wlan_hdd_cfg80211_get_key(
+static int __wlan_hdd_cfg80211_get_key(
struct wiphy *wiphy,
struct net_device *ndev,
u8 key_index, bool pairwise,
@@ -5338,7 +5367,7 @@
void (*callback)(void *cookie, struct key_params*)
)
#else
-static int wlan_hdd_cfg80211_get_key(
+static int __wlan_hdd_cfg80211_get_key(
struct wiphy *wiphy,
struct net_device *ndev,
u8 key_index, const u8 *mac_addr, void *cookie,
@@ -5406,6 +5435,38 @@
return 0;
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
+static int wlan_hdd_cfg80211_get_key(
+ struct wiphy *wiphy,
+ struct net_device *ndev,
+ u8 key_index, bool pairwise,
+ const u8 *mac_addr, void *cookie,
+ void (*callback)(void *cookie, struct key_params*)
+ )
+#else
+static int wlan_hdd_cfg80211_get_key(
+ struct wiphy *wiphy,
+ struct net_device *ndev,
+ u8 key_index, const u8 *mac_addr, void *cookie,
+ void (*callback)(void *cookie, struct key_params*)
+ )
+#endif
+{
+ int ret;
+
+ vos_ssr_protect(__func__);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
+ ret = __wlan_hdd_cfg80211_get_key(wiphy, ndev, key_index, pairwise,
+ mac_addr, cookie, callback);
+#else
+ ret = __wlan_hdd_cfg80211_get_key(wiphy, ndev, key_index, mac_addr,
+ callback);
+#endif
+ vos_ssr_unprotect(__func__);
+
+ return ret;
+}
+
/*
* FUNCTION: wlan_hdd_cfg80211_del_key
* This function is used to delete the key information
@@ -5516,16 +5577,16 @@
}
/*
- * FUNCTION: wlan_hdd_cfg80211_set_default_key
+ * FUNCTION: __wlan_hdd_cfg80211_set_default_key
* This function is used to set the default tx key index
*/
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
-static int wlan_hdd_cfg80211_set_default_key( struct wiphy *wiphy,
+static int __wlan_hdd_cfg80211_set_default_key( struct wiphy *wiphy,
struct net_device *ndev,
u8 key_index,
bool unicast, bool multicast)
#else
-static int wlan_hdd_cfg80211_set_default_key( struct wiphy *wiphy,
+static int __wlan_hdd_cfg80211_set_default_key( struct wiphy *wiphy,
struct net_device *ndev,
u8 key_index)
#endif
@@ -5664,6 +5725,30 @@
return status;
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
+static int wlan_hdd_cfg80211_set_default_key( struct wiphy *wiphy,
+ struct net_device *ndev,
+ u8 key_index,
+ bool unicast, bool multicast)
+#else
+static int wlan_hdd_cfg80211_set_default_key( struct wiphy *wiphy,
+ struct net_device *ndev,
+ u8 key_index)
+#endif
+{
+ int ret;
+ vos_ssr_protect(__func__);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
+ ret = __wlan_hdd_cfg80211_set_default_key(wiphy, ndev, key_index, unicast,
+ multicast);
+#else
+ ret = __wlan_hdd_cfg80211_set_default_key(wiphy, ndev, key_index);
+#endif
+ vos_ssr_unprotect(__func__);
+
+ return ret;
+}
+
/*
* FUNCTION: wlan_hdd_cfg80211_inform_bss
* This function is used to inform the BSS details to nl80211 interface.