]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[UM]: Fix use of skb after netif_rx
authorJulia Lawall <julia@diku.dk>
Tue, 11 Dec 2007 01:14:46 +0000 (17:14 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Tue, 11 Dec 2007 10:45:27 +0000 (02:45 -0800)
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>
arch/um/drivers/net_kern.c

index 73681f14f9fc17daaf3261fcf1562e33fb71fbfb..3c6c44ca1ffa5785e1d6f34618628fc75cfea831 100644 (file)
@@ -98,10 +98,10 @@ static int uml_net_rx(struct net_device *dev)
        if (pkt_len > 0) {
                skb_trim(skb, pkt_len);
                skb->protocol = (*lp->protocol)(skb);
-               netif_rx(skb);
 
                lp->stats.rx_bytes += skb->len;
                lp->stats.rx_packets++;
+               netif_rx(skb);
                return pkt_len;
        }