diff options
author | Patrick McHardy <kaber@trash.net> | 2006-09-18 02:59:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-09-18 02:59:57 -0400 |
commit | cbe21d8fefca605b90e34f0f019505e599712f9b (patch) | |
tree | b30a61468e18c04c91549231d4ca3b2cb67cb52b /net | |
parent | 080f22c0dc544e498e57ad281a9de063fa839957 (diff) |
[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')
-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 f9cef3671593..4172a5235916 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 | |||
626 | if ((int)snaplen < 0) | 626 | if ((int)snaplen < 0) |
627 | snaplen = 0; | 627 | snaplen = 0; |
628 | } | 628 | } |
629 | if (snaplen > skb->len-skb->data_len) | ||
630 | snaplen = skb->len-skb->data_len; | ||
631 | 629 | ||
632 | spin_lock(&sk->sk_receive_queue.lock); | 630 | spin_lock(&sk->sk_receive_queue.lock); |
633 | h = (struct tpacket_hdr *)packet_lookup_frame(po, po->head); | 631 | 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 | |||
644 | status &= ~TP_STATUS_LOSING; | 642 | status &= ~TP_STATUS_LOSING; |
645 | spin_unlock(&sk->sk_receive_queue.lock); | 643 | spin_unlock(&sk->sk_receive_queue.lock); |
646 | 644 | ||
647 | memcpy((u8*)h + macoff, skb->data, snaplen); | 645 | skb_copy_bits(skb, 0, (u8*)h + macoff, snaplen); |
648 | 646 | ||
649 | h->tp_len = skb->len; | 647 | h->tp_len = skb->len; |
650 | h->tp_snaplen = snaplen; | 648 | h->tp_snaplen = snaplen; |