diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-10-11 15:47:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-13 12:05:30 +0900 |
| commit | 0b1621f62382e9b6f97b35861e9ade1a979b95b8 (patch) | |
| tree | 91019d05487eb7c058b6b0dacd25ba5c44f11ea0 /net | |
| parent | 31da12cec6d7882acb2bd968566b1cfbbcae695a (diff) | |
| download | linux-3.10-0b1621f62382e9b6f97b35861e9ade1a979b95b8.tar.gz linux-3.10-0b1621f62382e9b6f97b35861e9ade1a979b95b8.tar.bz2 linux-3.10-0b1621f62382e9b6f97b35861e9ade1a979b95b8.zip | |
mac80211: fix crash if bitrate calculation goes wrong
commit d86aa4f8ca58898ec6a94c0635da20b948171ed7 upstream.
If a frame's timestamp is calculated, and the bitrate
calculation goes wrong and returns zero, the system
will attempt to divide by zero and crash. Catch this
case and print the rate information that the driver
reported when this happens.
Reported-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/util.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 72e6292955b..5db8eb5d56c 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -2174,6 +2174,10 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local, } rate = cfg80211_calculate_bitrate(&ri); + if (WARN_ONCE(!rate, + "Invalid bitrate: flags=0x%x, idx=%d, vht_nss=%d\n", + status->flag, status->rate_idx, status->vht_nss)) + return 0; /* rewind from end of MPDU */ if (status->flag & RX_FLAG_MACTIME_END) |