[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] Resend: [PATCH] skb_copy_bits() can return err]


  • To: xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxx>
  • From: Nivedita Singhvi <nsnix@xxxxxxxxxxx>
  • Date: Wed, 01 Jun 2005 16:11:28 -0700
  • Delivery-date: Wed, 01 Jun 2005 23:10:48 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xensource.com>

[Resend with patch included inline and signed-off by; sorry]

skb_copy_bits() can return an err, so have netif_be_start_xmit()
crash informatively..

thanks,
Nivedita

Signed-off-by: Nivedita Singhvi (niv@xxxxxxxxxx)
---
diff -urN 
xen-unstable-0601/linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c 
niv-unstable-0601/linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c
--- xen-unstable-0601/linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c     
2005-05-31 20:12:37.000000000 -0700
+++ niv-unstable-0601/linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c     
2005-06-01 15:20:52.954245318 -0700
@@ -153,7 +153,9 @@
             goto drop;
         skb_reserve(nskb, hlen);
         __skb_put(nskb, skb->len);
-        (void)skb_copy_bits(skb, -hlen, nskb->data - hlen, skb->len + hlen);
+        if (skb_copy_bits(skb, -hlen, nskb->data - hlen, skb->len + hlen)) {
+               BUG();
+       }
         nskb->dev = skb->dev;
         nskb->proto_csum_valid = skb->proto_csum_valid;
         dev_kfree_skb(skb);


diff -urN 
xen-unstable-0601/linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c 
niv-unstable-0601/linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c
--- xen-unstable-0601/linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c     
2005-05-31 20:12:37.000000000 -0700
+++ niv-unstable-0601/linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c     
2005-06-01 15:20:52.954245318 -0700
@@ -153,7 +153,9 @@
             goto drop;
         skb_reserve(nskb, hlen);
         __skb_put(nskb, skb->len);
-        (void)skb_copy_bits(skb, -hlen, nskb->data - hlen, skb->len + hlen);
+        if (skb_copy_bits(skb, -hlen, nskb->data - hlen, skb->len + hlen)) {
+               BUG();
+       }
         nskb->dev = skb->dev;
         nskb->proto_csum_valid = skb->proto_csum_valid;
         dev_kfree_skb(skb);

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.