diff options
| author |   Martin Willi <martin@strongswan.org> | 2016-05-13 12:41:48 +0200 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2016-05-31 12:11:54 +0200 |
| commit | 62397da50bb20a6b812c949ef465d7e69fe54bb6 (patch) | |
| tree | ba8b2c2e869f5c5a08f08e55ecf39e5f0c9f40a0 | |
| parent | net: l2tp: Make l2tp_ip6 namespace aware (diff) | |
| download | linux-dev-62397da50bb20a6b812c949ef465d7e69fe54bb6.tar.xz linux-dev-62397da50bb20a6b812c949ef465d7e69fe54bb6.zip | |
mac80211_hwsim: Add missing check for HWSIM_ATTR_SIGNAL
A wmediumd that does not send this attribute causes a NULL pointer
dereference, as the attribute is accessed even if it does not exist.
The attribute was required but never checked ever since userspace frame
forwarding has been introduced. The issue gets more problematic once we
allow wmediumd registration from user namespaces.
Cc: stable@vger.kernel.org
Fixes: 7882513bacb1 ("mac80211_hwsim driver support userspace frame tx/rx")
Signed-off-by: Martin Willi <martin@strongswan.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 9ed0ed1bf514..4dd5adcdd29b 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -2776,6 +2776,7 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2, if (!info->attrs[HWSIM_ATTR_ADDR_TRANSMITTER] || !info->attrs[HWSIM_ATTR_FLAGS] || !info->attrs[HWSIM_ATTR_COOKIE] || + !info->attrs[HWSIM_ATTR_SIGNAL] || !info->attrs[HWSIM_ATTR_TX_INFO]) goto out; |