Attachment 575272 Details for Bug 809908 – count vlan header on length verification

[patch] count vlan header on length verification

pch_gbe_vlan_offset (text/plain), 999 bytes, created by Veaceslav Falico on 2012-04-05 05:19:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Veaceslav Falico

Created: 2012-04-05 05:19:04 UTC

Size: 999 bytes

patch

obsolete

>commit 4983dc6386a8902e9933ed0b9ad6a8f1fec7bdf4
>Author: Veaceslav Falico <vfalico@redhat.com>
>Date:   Thu Apr 5 07:09:13 2012 +0200
>
>    pch_gbe: check for vlan header on skb len verification
>    
>    yadda yadda
>
>diff --git a/drivers/net/pch_gbe/pch_gbe_main.c b/drivers/net/pch_gbe/pch_gbe_main.c
>index 4d1b064..4658d69 100644
>--- a/drivers/net/pch_gbe/pch_gbe_main.c
>+++ b/drivers/net/pch_gbe/pch_gbe_main.c
>@@ -1923,8 +1923,11 @@ static int pch_gbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
> 	struct pch_gbe_adapter *adapter = netdev_priv(netdev);
> 	struct pch_gbe_tx_ring *tx_ring = adapter->tx_ring;
> 	unsigned long flags;
>+	int offset;
> 
>-	if (unlikely(skb->len > (adapter->hw.mac.max_frame_size - 4))) {
>+	offset = skb->protocol == htons(ETH_P_8021Q) ? 0 : 4;
>+
>+	if (unlikely(skb->len > (adapter->hw.mac.max_frame_size - offset))) {
> 		pr_err("Transfer length Error: skb len: %d > max: %d\n",
> 		       skb->len, adapter->hw.mac.max_frame_size);
> 		dev_kfree_skb_any(skb);

Actions: View | Diff

Attachments on bug 809908: 575180 | 575181 | 575272 | 576409