Attachment 576409 Details for Bug 809908 – upstream/fedora patch

[patch] upstream/fedora patch

809908 (text/plain), 1.03 KB, created by Veaceslav Falico on 2012-04-10 07:22:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Veaceslav Falico

Created: 2012-04-10 07:22:43 UTC

Size: 1.03 KB

patch

obsolete

>commit 95b628d0e8eb747467bf4c21cb1a062a5b7b90b5
>Author: Veaceslav Falico <vfalico@redhat.com>
>Date:   Tue Apr 10 08:14:17 2012 +0200
>
>    pch_gbe: correctly verify skb->len in vlan case
>    
>    TBD
>
>diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
>index 8035e5f..b4d20b7 100644
>--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
>+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
>@@ -2123,8 +2123,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