Commit f5563318 authored by Johannes Berg's avatar Johannes Berg

wireless: radiotap: fix parsing buffer overrun

When parsing an invalid radiotap header, the parser can overrun
the buffer that is passed in because it doesn't correctly check
 1) the minimum radiotap header size
 2) the space for extended bitmaps

The first issue doesn't affect any in-kernel user as they all
check the minimum size before calling the radiotap function.
The second issue could potentially affect the kernel if an skb
is passed in that consists only of the radiotap header with a
lot of extended bitmaps that extend past the SKB. In that case
a read-only buffer overrun by at most 4 bytes is possible.

Fix this by adding the appropriate checks to the parser.

Cc: stable@vger.kernel.org
Reported-by: default avatarEvan Huus <eapache@gmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f38dd58c
...@@ -97,6 +97,10 @@ int ieee80211_radiotap_iterator_init( ...@@ -97,6 +97,10 @@ int ieee80211_radiotap_iterator_init(
struct ieee80211_radiotap_header *radiotap_header, struct ieee80211_radiotap_header *radiotap_header,
int max_length, const struct ieee80211_radiotap_vendor_namespaces *vns) int max_length, const struct ieee80211_radiotap_vendor_namespaces *vns)
{ {
/* check the radiotap header can actually be present */
if (max_length < sizeof(struct ieee80211_radiotap_header))
return -EINVAL;
/* Linux only supports version 0 radiotap format */ /* Linux only supports version 0 radiotap format */
if (radiotap_header->it_version) if (radiotap_header->it_version)
return -EINVAL; return -EINVAL;
...@@ -131,7 +135,8 @@ int ieee80211_radiotap_iterator_init( ...@@ -131,7 +135,8 @@ int ieee80211_radiotap_iterator_init(
*/ */
if ((unsigned long)iterator->_arg - if ((unsigned long)iterator->_arg -
(unsigned long)iterator->_rtheader > (unsigned long)iterator->_rtheader +
sizeof(uint32_t) >
(unsigned long)iterator->_max_length) (unsigned long)iterator->_max_length)
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment