aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-06-02 08:10:58 +0000
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-06-02 08:10:58 +0000
commit56b9e01ac8817be1059e4260f2298d040684209e (patch)
tree5c168999eb5bef603ecaaab4f854e8e28c8c3ba4
parentf7e5e27947fc992c6a4a0b832d2e168a0c088db7 (diff)
downloadxen-56b9e01ac8817be1059e4260f2298d040684209e.tar.gz
xen-56b9e01ac8817be1059e4260f2298d040684209e.tar.bz2
xen-56b9e01ac8817be1059e4260f2298d040684209e.zip
bitkeeper revision 1.1632 (429ebf12k6wKnt6NCp_ccTvyXrINWg)
skb_copy_bits() can return an err, so have netif_be_start_xmit() crash informatively. Signed-off-by: Nivedita Singhvi <niv@us.ibm.com>
-rw-r--r--linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c b/linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c
index 6b69decbc0..02f0c2fc51 100644
--- a/linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c
+++ b/linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c
@@ -153,7 +153,8 @@ int netif_be_start_xmit(struct sk_buff *skb, struct net_device *dev)
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);