| From 62397da50bb20a6b812c949ef465d7e69fe54bb6 Mon Sep 17 00:00:00 2001 |
| From: Martin Willi <martin@strongswan.org> |
| Date: Fri, 13 May 2016 12:41:48 +0200 |
| Subject: mac80211_hwsim: Add missing check for HWSIM_ATTR_SIGNAL |
| |
| From: Martin Willi <martin@strongswan.org> |
| |
| commit 62397da50bb20a6b812c949ef465d7e69fe54bb6 upstream. |
| |
| 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. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/wireless/mac80211_hwsim.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/drivers/net/wireless/mac80211_hwsim.c |
| +++ b/drivers/net/wireless/mac80211_hwsim.c |
| @@ -2723,6 +2723,7 @@ static int hwsim_tx_info_frame_received_ |
| 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; |
| |
