korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 21:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

mac802154: Fix memory corruption with global deferred transmit state.

Browse Source 
When transmitting a packet via a mac802154 driver that can sleep in
its transmit function, mac802154 defers the call to the driver's
transmit function to a per-device workqueue.

However, mac802154 uses a single global work_struct for this, which
means that if you have more than one registered mac802154 interface
in the system, and you transmit on more than one of them at the same
time, you'll very easily cause memory corruption.

This patch moves the deferred transmit processing state from global
variables to struct ieee802154_local, and this seems to fix the memory
corruption issue.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Acked-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Lennert Buytenhek 2015-07-21 17:44:47 +03:00 committed by Marcel Holtmann
parent 8b44f0dd2f
commit c22ff7b4e7
3 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac802154/ieee802154_i.h
View File

@ -60,6 +60,9 @@ struct ieee802154_local {
struct tasklet_struct tasklet; struct tasklet_struct tasklet;
struct sk_buff_head skb_queue; struct sk_buff_head skb_queue;
struct sk_buff *tx_skb;
struct work_struct tx_work;
}; };
enum { enum {
@ -125,6 +128,7 @@ ieee802154_sdata_running(struct ieee802154_sub_if_data *sdata)
extern struct ieee802154_mlme_ops mac802154_mlme_wpan; extern struct ieee802154_mlme_ops mac802154_mlme_wpan;
void ieee802154_rx(struct ieee802154_local *local, struct sk_buff *skb); void ieee802154_rx(struct ieee802154_local *local, struct sk_buff *skb);
void ieee802154_xmit_worker(struct work_struct *work);
netdev_tx_t netdev_tx_t
ieee802154_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev); ieee802154_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev);
netdev_tx_t netdev_tx_t

2
net/mac802154/main.c
View File

@ -105,6 +105,8 @@ ieee802154_alloc_hw(size_t priv_data_len, const struct ieee802154_ops *ops)
skb_queue_head_init(&local->skb_queue); skb_queue_head_init(&local->skb_queue);
INIT_WORK(&local->tx_work, ieee802154_xmit_worker);
/* init supported flags with 802.15.4 default ranges */ /* init supported flags with 802.15.4 default ranges */
phy->supported.max_minbe = 8; phy->supported.max_minbe = 8;
phy->supported.min_maxbe = 3; phy->supported.min_maxbe = 3;

27
net/mac802154/tx.c
View File

@ -30,23 +30,11 @@
#include "ieee802154_i.h" #include "ieee802154_i.h"
#include "driver-ops.h" #include "driver-ops.h"
/* IEEE 802.15.4 transceivers can sleep during the xmit session, so process void ieee802154_xmit_worker(struct work_struct *work)
* packets through the workqueue.
*/
struct ieee802154_xmit_cb {
struct sk_buff *skb;
struct work_struct work;
struct ieee802154_local *local;
};
static struct ieee802154_xmit_cb ieee802154_xmit_cb;
static void ieee802154_xmit_worker(struct work_struct *work)
{ {
struct ieee802154_xmit_cb *cb = struct ieee802154_local *local =
container_of(work, struct ieee802154_xmit_cb, work); container_of(work, struct ieee802154_local, tx_work);
struct ieee802154_local *local = cb->local; struct sk_buff *skb = local->tx_skb;
struct sk_buff *skb = cb->skb;
struct net_device *dev = skb->dev; struct net_device *dev = skb->dev;
int res; int res;
@ -106,11 +94,8 @@ ieee802154_tx(struct ieee802154_local *local, struct sk_buff *skb)
dev->stats.tx_packets++; dev->stats.tx_packets++;
dev->stats.tx_bytes += skb->len; dev->stats.tx_bytes += skb->len;
} else { } else {
INIT_WORK(&ieee802154_xmit_cb.work, ieee802154_xmit_worker); local->tx_skb = skb;
ieee802154_xmit_cb.skb = skb; queue_work(local->workqueue, &local->tx_work);
ieee802154_xmit_cb.local = local;
queue_work(local->workqueue, &ieee802154_xmit_cb.work);
} }
return NETDEV_TX_OK; return NETDEV_TX_OK;