X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=net%2Fpacket%2Faf_packet.c;fp=net%2Fpacket%2Faf_packet.c;h=9db7dbdb16e6bd14c7ca23dc6c8dfe11e16f4566;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=4172a5235916e3f71ee6fbed85b4c296ab9de3c4;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 4172a5235..9db7dbdb1 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -49,6 +49,7 @@
  *
  */
  
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
@@ -626,6 +627,8 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
 		if ((int)snaplen < 0)
 			snaplen = 0;
 	}
+	if (snaplen > skb->len-skb->data_len)
+		snaplen = skb->len-skb->data_len;
 
 	spin_lock(&sk->sk_receive_queue.lock);
 	h = (struct tpacket_hdr *)packet_lookup_frame(po, po->head);
@@ -642,7 +645,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
 		status &= ~TP_STATUS_LOSING;
 	spin_unlock(&sk->sk_receive_queue.lock);
 
-	skb_copy_bits(skb, 0, (u8*)h + macoff, snaplen);
+	memcpy((u8*)h + macoff, skb->data, snaplen);
 
 	h->tp_len = skb->len;
 	h->tp_snaplen = snaplen;