| Message ID | 1450133050-24636-1-git-send-email-vyasevich@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Vladislav Yasevich <vyasevich@gmail.com> Date: Mon, 14 Dec 2015 17:44:10 -0500 > skb_reorder_vlan_header is called after the vlan header has > been pulled. As a result the offset of the begining of > the mac header has been incrased by 4 bytes (VLAN_HLEN). > When moving the mac addresses, include this incrase in > the offset calcualation so that the mac addresses are > copied correctly. > > Fixes: a6e18ff1117 (vlan: Fix untag operations of stacked vlans with REORDER_HEADER off) > CC: Nicolas Dichtel <nicolas.dichtel@6wind.com> > CC: Patrick McHardy <kaber@trash.net> > Signed-off-by: Vladislav Yasevich <vyasevich@gmail.com> Applied and queued up for -stable, thanks Vlad. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Le 14/12/2015 23:44, Vladislav Yasevich a écrit : > skb_reorder_vlan_header is called after the vlan header has > been pulled. As a result the offset of the begining of > the mac header has been incrased by 4 bytes (VLAN_HLEN). > When moving the mac addresses, include this incrase in > the offset calcualation so that the mac addresses are > copied correctly. > > Fixes: a6e18ff1117 (vlan: Fix untag operations of stacked vlans with REORDER_HEADER off) > CC: Nicolas Dichtel <nicolas.dichtel@6wind.com> > CC: Patrick McHardy <kaber@trash.net> > Signed-off-by: Vladislav Yasevich <vyasevich@gmail.com> Thank you for the fix. A bit late, but for the record: Tested-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 152b9c7..5cc43d37 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4268,7 +4268,7 @@ static struct sk_buff *skb_reorder_vlan_header(struct sk_buff *skb) return NULL; } - memmove(skb->data - ETH_HLEN, skb->data - skb->mac_len, + memmove(skb->data - ETH_HLEN, skb->data - skb->mac_len - VLAN_HLEN, 2 * ETH_ALEN); skb->mac_header += VLAN_HLEN; return skb;
skb_reorder_vlan_header is called after the vlan header has been pulled. As a result the offset of the begining of the mac header has been incrased by 4 bytes (VLAN_HLEN). When moving the mac addresses, include this incrase in the offset calcualation so that the mac addresses are copied correctly. Fixes: a6e18ff1117 (vlan: Fix untag operations of stacked vlans with REORDER_HEADER off) CC: Nicolas Dichtel <nicolas.dichtel@6wind.com> CC: Patrick McHardy <kaber@trash.net> Signed-off-by: Vladislav Yasevich <vyasevich@gmail.com> --- net/core/skbuff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)