commit 1b9df2d20eee9f3a675d1a3a7aa3640e6d8d7e94
author Ola Olsson <ola1olsson@gmail.com> Mon Nov 09 22:02:09 2015 +0100
committer Johannes Berg <johannes.berg@intel.com> Fri Dec 04 14:43:32 2015 +0100
tree cdbe085620f5dd2fd225969079caf99d7db5dbc8
parent cf595922b9a3b61e308224fd29909f54ecb557d4

cfg80211: ocb: Fix null pointer deref if join_ocb is unimplemented

Signed-off-by: Ola Olsson <ola.olsson@sonymobile.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

net/wireless/ocb.c

diff --git a/net/wireless/ocb.c b/net/wireless/ocb.c
index c00d4a7..e64dbf1 100644
--- a/net/wireless/ocb.c
+++ b/net/wireless/ocb.c
@@ -29,6 +29,9 @@
 	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_OCB)
 		return -EOPNOTSUPP;
 
+	if (!rdev->ops->join_ocb)
+		return -EOPNOTSUPP;
+
 	if (WARN_ON(!setup->chandef.chan))
 		return -EINVAL;