diff options
author | Julia Lawall <julia@diku.dk> | 2007-12-10 20:14:46 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-12-11 05:45:27 -0500 |
commit | 505a41d43c24345f3fa77ddab152d1f82dd8264d (patch) | |
tree | f7d30d04faa899cf0ac3a36f29e0b3b1227837c2 /arch/um/drivers | |
parent | 95a02cfd4d33886c166d4a5f309120f8d32ced58 (diff) |
[UM]: Fix use of skb after netif_rx
Recently, Wang Chen submitted a patch
(d30f53aeb31d453a5230f526bea592af07944564) to move a call to netif_rx(skb)
after a subsequent reference to skb, because netif_rx may call kfree_skb on
its argument. The same problem occurs in some other drivers as well.
This was found using the following semantic match.
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
expression skb, e,e1;
@@
(
netif_rx(skb);
|
netif_rx_ni(skb);
)
... when != skb = e
(
skb = e1
|
* skb
)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/um/drivers')
-rw-r--r-- | arch/um/drivers/net_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c index 73681f14f9fc..3c6c44ca1ffa 100644 --- a/arch/um/drivers/net_kern.c +++ b/arch/um/drivers/net_kern.c | |||
@@ -98,10 +98,10 @@ static int uml_net_rx(struct net_device *dev) | |||
98 | if (pkt_len > 0) { | 98 | if (pkt_len > 0) { |
99 | skb_trim(skb, pkt_len); | 99 | skb_trim(skb, pkt_len); |
100 | skb->protocol = (*lp->protocol)(skb); | 100 | skb->protocol = (*lp->protocol)(skb); |
101 | netif_rx(skb); | ||
102 | 101 | ||
103 | lp->stats.rx_bytes += skb->len; | 102 | lp->stats.rx_bytes += skb->len; |
104 | lp->stats.rx_packets++; | 103 | lp->stats.rx_packets++; |
104 | netif_rx(skb); | ||
105 | return pkt_len; | 105 | return pkt_len; |
106 | } | 106 | } |
107 | 107 | ||