diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-09-17 23:59:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-09-17 23:59:57 -0700 |
| commit | cbe21d8fefca605b90e34f0f019505e599712f9b (patch) | |
| tree | b30a61468e18c04c91549231d4ca3b2cb67cb52b /net/packet | |
| parent | 080f22c0dc544e498e57ad281a9de063fa839957 (diff) | |
| download | op-kernel-dev-cbe21d8fefca605b90e34f0f019505e599712f9b.zip op-kernel-dev-cbe21d8fefca605b90e34f0f019505e599712f9b.tar.gz | |
[PACKET]: Don't truncate non-linear skbs with mmaped IO
Non-linear skbs are truncated to their linear part with mmaped IO.
Fix by using skb_copy_bits instead of memcpy.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/af_packet.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index f9cef36..4172a52 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -626,8 +626,6 @@ 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); @@ -644,7 +642,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); - memcpy((u8*)h + macoff, skb->data, snaplen); + skb_copy_bits(skb, 0, (u8*)h + macoff, snaplen); h->tp_len = skb->len; h->tp_snaplen = snaplen; |
