diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-12-06 14:55:57 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-12-06 14:55:57 -0500 |
| commit | 55cb0797fa779e36f62876a8aa44cbf3984e8d59 (patch) | |
| tree | ea84d334ec666e558d3e4c6dd259a8f239374432 /net/mac80211 | |
| parent | 795e9364215dc98b1dea888ebae22383ecbbb92a (diff) | |
| parent | 289814918ce3af1296ac7d9b05508bde64e97348 (diff) | |
Merge tag 'nfc-fixes-3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0
This is an NFC LLCP fix for 3.7 and contains only one patch.
It fixes a potential crash when receiving an LLCP HDLC frame acking a frame
that is not the last sent one. In that case we may dereference an already
freed pointer.
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/offchannel.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index 5abddfe3e101..a5379aea7d09 100644 --- a/net/mac80211/offchannel.c +++ b/net/mac80211/offchannel.c | |||
| @@ -462,8 +462,6 @@ void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata) | |||
| 462 | list_move_tail(&roc->list, &tmp_list); | 462 | list_move_tail(&roc->list, &tmp_list); |
| 463 | roc->abort = true; | 463 | roc->abort = true; |
| 464 | } | 464 | } |
| 465 | |||
| 466 | ieee80211_start_next_roc(local); | ||
| 467 | mutex_unlock(&local->mtx); | 465 | mutex_unlock(&local->mtx); |
| 468 | 466 | ||
| 469 | list_for_each_entry_safe(roc, tmp, &tmp_list, list) { | 467 | list_for_each_entry_safe(roc, tmp, &tmp_list, list) { |