Commit c22eb87b authored by Ivo van Doorn's avatar Ivo van Doorn Committed by David S. Miller
Browse files

[PATCH] rt2x00: Allways memset memory obtained from skb_push() 



When skb_push() is used we should memset the memory before
usage. This will prevent bugs which could occur when the
data is treated as TX descriptor.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 37894473

drivers/net/wireless/rt2x00/rt2500usb.c

+2 −0
Original line number Diff line number Diff line
@@ -1665,6 +1665,8 @@ static int rt2500usb_beacon_update(struct ieee80211_hw *hw, 
	 * First we create the beacon.

	 */

	skb_push(skb, ring->desc_size);

	memset(skb->data, 0, ring->desc_size);



	rt2x00lib_write_tx_desc(rt2x00dev, (struct data_desc *)skb->data,

				(struct ieee80211_hdr *)(skb->data +

							 ring->desc_size),

drivers/net/wireless/rt2x00/rt61pci.c

+2 −0
Original line number Diff line number Diff line
@@ -2437,6 +2437,8 @@ static int rt61pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb, 
	 * First we create the beacon.

	 */

	skb_push(skb, TXD_DESC_SIZE);

	memset(skb->data, 0, TXD_DESC_SIZE);



	rt2x00lib_write_tx_desc(rt2x00dev, (struct data_desc *)skb->data,

				(struct ieee80211_hdr *)(skb->data +

							 TXD_DESC_SIZE),

drivers/net/wireless/rt2x00/rt73usb.c

+2 −0
Original line number Diff line number Diff line
@@ -1939,6 +1939,8 @@ static int rt73usb_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb, 
	 * First we create the beacon.

	 */

	skb_push(skb, TXD_DESC_SIZE);

	memset(skb->data, 0, TXD_DESC_SIZE);



	rt2x00lib_write_tx_desc(rt2x00dev, (struct data_desc *)skb->data,

				(struct ieee80211_hdr *)(skb->data +

							 TXD_DESC_SIZE),

CRA Git | Maintained and supported by SUSTech CRA and CCSE