diff options
| author | Arik Nemtsov <arik@wizery.com> | 2011-06-22 17:00:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-27 14:45:25 -0400 |
| commit | a66b98db570a638afd909459e1e6bfa272344bd3 (patch) | |
| tree | e4e78a0602b46121548fad2e357f03d550d23c94 /include/net | |
| parent | 8fcbd4dc7a1b338b393dcd6869deb1725cf1a9f3 (diff) | |
mac80211: fix rx->key NULL dereference during mic failure
Sometimes when reporting a MIC failure rx->key may be unset. This
code path is hit when receiving a packet meant for a multicast
address, and decryption is performed in HW.
Fortunately, the failing key_idx is not used for anything up to
(and including) usermode, so we allow ourselves to drop it on the
way up when a key cannot be retrieved.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Cc: stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/cfg80211.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 0589f554788a..396e8fc8910e 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
| @@ -2688,7 +2688,7 @@ void cfg80211_send_unprot_disassoc(struct net_device *dev, const u8 *buf, | |||
| 2688 | * @dev: network device | 2688 | * @dev: network device |
| 2689 | * @addr: The source MAC address of the frame | 2689 | * @addr: The source MAC address of the frame |
| 2690 | * @key_type: The key type that the received frame used | 2690 | * @key_type: The key type that the received frame used |
| 2691 | * @key_id: Key identifier (0..3) | 2691 | * @key_id: Key identifier (0..3). Can be -1 if missing. |
| 2692 | * @tsc: The TSC value of the frame that generated the MIC failure (6 octets) | 2692 | * @tsc: The TSC value of the frame that generated the MIC failure (6 octets) |
| 2693 | * @gfp: allocation flags | 2693 | * @gfp: allocation flags |
| 2694 | * | 2694 | * |