diff options
| author | Ola Olsson <ola1olsson@gmail.com> | 2015-11-09 22:02:09 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-12-04 14:43:32 +0100 |
| commit | 1b9df2d20eee9f3a675d1a3a7aa3640e6d8d7e94 (patch) | |
| tree | cdbe085620f5dd2fd225969079caf99d7db5dbc8 /net | |
| parent | nl80211: clarify NL80211_ATTR_SCHED_SCAN_DELAY usage with net-detect (diff) | |
| download | linux-1b9df2d20eee9f3a675d1a3a7aa3640e6d8d7e94.tar.xz linux-1b9df2d20eee9f3a675d1a3a7aa3640e6d8d7e94.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/ocb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/ocb.c b/net/wireless/ocb.c index c00d4a792319..e64dbf16330c 100644 --- a/net/wireless/ocb.c +++ b/net/wireless/ocb.c @@ -29,6 +29,9 @@ int __cfg80211_join_ocb(struct cfg80211_registered_device *rdev, 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; |