]> err.no Git - linux-2.6/commitdiff
[XTENSA]: Fix use of skb after netif_rx
authorJulia Lawall <julia@diku.dk>
Tue, 11 Dec 2007 01:16:56 +0000 (17:16 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Tue, 11 Dec 2007 10:45:28 +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/xtensa/platform-iss/network.c

index b61fb36674e7f7e571aac77bb534165aa750d875..f21b9b0899a8e3ae277d08256aab7207940f0aa2 100644 (file)
@@ -393,11 +393,11 @@ static int iss_net_rx(struct net_device *dev)
        if (pkt_len > 0) {
                skb_trim(skb, pkt_len);
                skb->protocol = lp->tp.protocol(skb);
-       //      netif_rx(skb);
-               netif_rx_ni(skb);
 
                lp->stats.rx_bytes += skb->len;
                lp->stats.rx_packets++;
+       //      netif_rx(skb);
+               netif_rx_ni(skb);
                return pkt_len;
        }
        kfree_skb(skb);