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

[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
...@@ -478,14 +478,14 @@ ctc_unpack_skb(struct channel *ch, struct sk_buff *pskb) ...@@ -478,14 +478,14 @@ ctc_unpack_skb(struct channel *ch, struct sk_buff *pskb)
skb->dev = pskb->dev; skb->dev = pskb->dev;
skb->protocol = pskb->protocol; skb->protocol = pskb->protocol;
pskb->ip_summed = CHECKSUM_UNNECESSARY; pskb->ip_summed = CHECKSUM_UNNECESSARY;
netif_rx_ni(skb);
/** /**
* Successful rx; reset logflags * reset logflags
*/ */
ch->logflags = 0; ch->logflags = 0;
dev->last_rx = jiffies;
privptr->stats.rx_packets++; privptr->stats.rx_packets++;
privptr->stats.rx_bytes += skb->len; privptr->stats.rx_bytes += skb->len;
netif_rx_ni(skb);
dev->last_rx = jiffies;
if (len > 0) { if (len > 0) {
skb_pull(pskb, header->length); skb_pull(pskb, header->length);
if (skb_tailroom(pskb) < LL_HEADER_LENGTH) { if (skb_tailroom(pskb) < LL_HEADER_LENGTH) {
......
...@@ -639,14 +639,14 @@ static void netiucv_unpack_skb(struct iucv_connection *conn, ...@@ -639,14 +639,14 @@ static void netiucv_unpack_skb(struct iucv_connection *conn,
skb->dev = pskb->dev; skb->dev = pskb->dev;
skb->protocol = pskb->protocol; skb->protocol = pskb->protocol;
pskb->ip_summed = CHECKSUM_UNNECESSARY; 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), * Since receiving is always initiated from a tasklet (in iucv.c),
* we must use netif_rx_ni() instead of netif_rx() * we must use netif_rx_ni() instead of netif_rx()
*/ */
netif_rx_ni(skb); netif_rx_ni(skb);
dev->last_rx = jiffies; dev->last_rx = jiffies;
privptr->stats.rx_packets++;
privptr->stats.rx_bytes += skb->len;
skb_pull(pskb, header->next); skb_pull(pskb, header->next);
skb_put(pskb, NETIUCV_HDRLEN); skb_put(pskb, NETIUCV_HDRLEN);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment