diff options
author | Julia Lawall <julia@diku.dk> | 2007-12-10 20:17:37 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-12-11 05:45:29 -0500 |
commit | 9b3efc0133a807070dbd21254102995b65969965 (patch) | |
tree | 86f609aef9c7e2534ccf7f1a1b06d8e29c2ba676 /drivers | |
parent | 299f590f26da9764f20e905879f0090552ff2e86 (diff) |
[S390]: Fix use of skb after netif_rx
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. 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: Julia Lawall <julia@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/s390/net/ctcmain.c | 6 | ||||
-rw-r--r-- | drivers/s390/net/netiucv.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c index 97adc701a819..77a503139e32 100644 --- a/drivers/s390/net/ctcmain.c +++ b/drivers/s390/net/ctcmain.c | |||
@@ -478,14 +478,14 @@ ctc_unpack_skb(struct channel *ch, struct sk_buff *pskb) | |||
478 | skb->dev = pskb->dev; | 478 | skb->dev = pskb->dev; |
479 | skb->protocol = pskb->protocol; | 479 | skb->protocol = pskb->protocol; |
480 | pskb->ip_summed = CHECKSUM_UNNECESSARY; | 480 | pskb->ip_summed = CHECKSUM_UNNECESSARY; |
481 | netif_rx_ni(skb); | ||
482 | /** | 481 | /** |
483 | * Successful rx; reset logflags | 482 | * reset logflags |
484 | */ | 483 | */ |
485 | ch->logflags = 0; | 484 | ch->logflags = 0; |
486 | dev->last_rx = jiffies; | ||
487 | privptr->stats.rx_packets++; | 485 | privptr->stats.rx_packets++; |
488 | privptr->stats.rx_bytes += skb->len; | 486 | privptr->stats.rx_bytes += skb->len; |
487 | netif_rx_ni(skb); | ||
488 | dev->last_rx = jiffies; | ||
489 | if (len > 0) { | 489 | if (len > 0) { |
490 | skb_pull(pskb, header->length); | 490 | skb_pull(pskb, header->length); |
491 | if (skb_tailroom(pskb) < LL_HEADER_LENGTH) { | 491 | if (skb_tailroom(pskb) < LL_HEADER_LENGTH) { |
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index 4d18d6419ddc..c7ea9381db9f 100644 --- a/drivers/s390/net/netiucv.c +++ b/drivers/s390/net/netiucv.c | |||
@@ -639,14 +639,14 @@ static void netiucv_unpack_skb(struct iucv_connection *conn, | |||
639 | skb->dev = pskb->dev; | 639 | skb->dev = pskb->dev; |
640 | skb->protocol = pskb->protocol; | 640 | skb->protocol = pskb->protocol; |
641 | pskb->ip_summed = CHECKSUM_UNNECESSARY; | 641 | pskb->ip_summed = CHECKSUM_UNNECESSARY; |
642 | privptr->stats.rx_packets++; | ||
643 | privptr->stats.rx_bytes += skb->len; | ||
642 | /* | 644 | /* |
643 | * Since receiving is always initiated from a tasklet (in iucv.c), | 645 | * Since receiving is always initiated from a tasklet (in iucv.c), |
644 | * we must use netif_rx_ni() instead of netif_rx() | 646 | * we must use netif_rx_ni() instead of netif_rx() |
645 | */ | 647 | */ |
646 | netif_rx_ni(skb); | 648 | netif_rx_ni(skb); |
647 | dev->last_rx = jiffies; | 649 | dev->last_rx = jiffies; |
648 | privptr->stats.rx_packets++; | ||
649 | privptr->stats.rx_bytes += skb->len; | ||
650 | skb_pull(pskb, header->next); | 650 | skb_pull(pskb, header->next); |
651 | skb_put(pskb, NETIUCV_HDRLEN); | 651 | skb_put(pskb, NETIUCV_HDRLEN); |
652 | } | 652 | } |