Skip to content

Commit

Permalink
irda: fix a race in irlan_eth_xmit()
Browse files Browse the repository at this point in the history
After skb is queued, its illegal to dereference it.

Cache skb->len into a temporary variable.

Signed-off-by: Eric Dumazet <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
Eric Dumazet authored and davem330 committed Aug 19, 2010
1 parent 9c38657 commit 79c5f51
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion net/irda/irlan/irlan_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ static netdev_tx_t irlan_eth_xmit(struct sk_buff *skb,
{
struct irlan_cb *self = netdev_priv(dev);
int ret;
unsigned int len;

/* skb headroom large enough to contain all IrDA-headers? */
if ((skb_headroom(skb) < self->max_header_size) || (skb_shared(skb))) {
Expand All @@ -188,6 +189,7 @@ static netdev_tx_t irlan_eth_xmit(struct sk_buff *skb,

dev->trans_start = jiffies;

len = skb->len;
/* Now queue the packet in the transport layer */
if (self->use_udata)
ret = irttp_udata_request(self->tsap_data, skb);
Expand All @@ -209,7 +211,7 @@ static netdev_tx_t irlan_eth_xmit(struct sk_buff *skb,
self->stats.tx_dropped++;
} else {
self->stats.tx_packets++;
self->stats.tx_bytes += skb->len;
self->stats.tx_bytes += len;
}

return NETDEV_TX_OK;
Expand Down

0 comments on commit 79c5f51

Please sign in to comment.