diff options
author | Gertjan van Wingerde <gwingerde@gmail.com> | 2010-06-03 04:51:45 -0400 |
---|---|---|
committer | Ivo van Doorn <IvDoorn@gmail.com> | 2010-06-03 04:51:45 -0400 |
commit | 0b8004aa12d13ec750d102ba4082a95f0107c649 (patch) | |
tree | eac5224159d34ae525b552254816c3a1e056336c /drivers/net/wireless/rt2x00/rt61pci.c | |
parent | baaffe67b5b33e4215409669226ef623cb65e15c (diff) |
rt2x00: Properly reserve room for descriptors in skbs.
Instead of fiddling with the skb->data pointer and thereby risking
out of bounds accesses, properly reserve the space needed in an
skb for descriptors.
Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt61pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index a7205c1711d..243df08ae91 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c | |||
@@ -2110,7 +2110,7 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev) | |||
2110 | __set_bit(TXDONE_UNKNOWN, &txdesc.flags); | 2110 | __set_bit(TXDONE_UNKNOWN, &txdesc.flags); |
2111 | txdesc.retry = 0; | 2111 | txdesc.retry = 0; |
2112 | 2112 | ||
2113 | rt2x00lib_txdone(entry_done, &txdesc); | 2113 | rt2x00pci_txdone(entry_done, &txdesc); |
2114 | entry_done = rt2x00queue_get_entry(queue, Q_INDEX_DONE); | 2114 | entry_done = rt2x00queue_get_entry(queue, Q_INDEX_DONE); |
2115 | } | 2115 | } |
2116 | 2116 | ||
@@ -2130,7 +2130,7 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev) | |||
2130 | } | 2130 | } |
2131 | txdesc.retry = rt2x00_get_field32(reg, STA_CSR4_RETRY_COUNT); | 2131 | txdesc.retry = rt2x00_get_field32(reg, STA_CSR4_RETRY_COUNT); |
2132 | 2132 | ||
2133 | rt2x00lib_txdone(entry, &txdesc); | 2133 | rt2x00pci_txdone(entry, &txdesc); |
2134 | } | 2134 | } |
2135 | } | 2135 | } |
2136 | 2136 | ||