d80211: Fix skb panic during passive scan
PATCH 1/1 d80211: Fix skb panic during passive scan
Only add the extra_tx_headroom to the len when allocating the sk_buff. This will prevent using an invalid length for skb_put which would cause a skb panic inside the driver.
Signed-off-by Ivo van Doorn <[email protected]>
---
net/d80211/ieee80211_scan.c +3 -2
@@ -280,7 +280,7 @@ void ieee80211_init_scan(struct ieee80211_local *local) {struct ieee80211_hdr hdr;u16 fc; -int len =10 + local->hw.extra_tx_headroom; +int len =10 ;struct rate_control_extra extra;/* Only initialize passive scanning if the hardware supports it */
@@ -303,7 +303,8 @@ void ieee80211_init_scan(struct ieee80211_local *local)/* Create a CTS from for broadcasting before * the low level changes channels */ - local->scan.skb =alloc_skb (len,GFP_KERNEL ); + local->scan.skb =alloc_skb (len + local->hw.extra_tx_headroom, +GFP_KERNEL );if (!local->scan.skb) {printk (KERN_WARNING "%s: Failed to allocate CTS packet for " "passive scan\n" , local->mdev->name);
Jiri Benc
AppliedQuoted 3 lines · Ivo van Doorn
Only add the
extra_tx_headroomto the len when allocating thesk_buff. This will prevent using an invalid length forskb_putwhich would cause a skb panic inside the driver.
Applied, thanks for the patch!
Jiri
Signature · 2 lines
Jiri Benc SUSE Labs