Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 299f590f authored by Julia Lawall's avatar Julia Lawall Committed by David S. Miller
Browse files

[XTENSA]: Fix use of skb after netif_rx 

Recently, Wang Chen submitted a patch
(d30f53ae) 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: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 505a41d4

arch/xtensa/platform-iss/network.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -393,11 +393,11 @@ static int iss_net_rx(struct net_device *dev) 
	if (pkt_len > 0) {

	if (pkt_len > 0) {

		skb_trim(skb, pkt_len);

		skb_trim(skb, pkt_len);

		skb->protocol = lp->tp.protocol(skb);

		skb->protocol = lp->tp.protocol(skb);

	//	netif_rx(skb);

		netif_rx_ni(skb);





		lp->stats.rx_bytes += skb->len;

		lp->stats.rx_bytes += skb->len;

		lp->stats.rx_packets++;

		lp->stats.rx_packets++;

	//	netif_rx(skb);

		netif_rx_ni(skb);

		return pkt_len;

		return pkt_len;

	}

	}

	kfree_skb(skb);

	kfree_skb(skb);