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

Commit 9b3efc01 authored by Julia Lawall's avatar Julia Lawall Committed by David S. Miller
Browse files

[S390]: 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.  netif_rx_ni calls netif_rx, so the same problem occurs in
the files below.

I have left the updating of dev->last_rx after the calls to netif_rx_ni
because it seems time dependent, but moved the other field updates before.

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 299f590f

drivers/s390/net/ctcmain.c

+3 −3
Original line number Diff line number Diff line
@@ -478,14 +478,14 @@ ctc_unpack_skb(struct channel *ch, struct sk_buff *pskb) 
		skb->dev = pskb->dev;

		skb->protocol = pskb->protocol;

		pskb->ip_summed = CHECKSUM_UNNECESSARY;

		netif_rx_ni(skb);

		/**

		 * Successful rx; reset logflags

		 * reset logflags

		 */

		ch->logflags = 0;

		dev->last_rx = jiffies;

		privptr->stats.rx_packets++;

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

		netif_rx_ni(skb);

		dev->last_rx = jiffies;

		if (len > 0) {

			skb_pull(pskb, header->length);

			if (skb_tailroom(pskb) < LL_HEADER_LENGTH) {

drivers/s390/net/netiucv.c

+2 −2
Original line number Diff line number Diff line
@@ -639,14 +639,14 @@ static void netiucv_unpack_skb(struct iucv_connection *conn, 
		skb->dev = pskb->dev;

		skb->protocol = pskb->protocol;

		pskb->ip_summed = CHECKSUM_UNNECESSARY;

		privptr->stats.rx_packets++;

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

		/*

		 * Since receiving is always initiated from a tasklet (in iucv.c),

		 * we must use netif_rx_ni() instead of netif_rx()

		 */

		netif_rx_ni(skb);

		dev->last_rx = jiffies;

		privptr->stats.rx_packets++;

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

		skb_pull(pskb, header->next);

		skb_put(pskb, NETIUCV_HDRLEN);

	}