| Message ID | 1349194457-31623-1-git-send-email-ordex@autistici.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Antonio Quartulli <ordex@autistici.org> Date: Tue, 2 Oct 2012 18:14:17 +0200 > skb_reset_mac_len() relies on the value of the skb->network_header pointer, > therefore we must wait for such pointer to be recalculated before computing > the new mac_len value. > > Signed-off-by: Antonio Quartulli <ordex@autistici.org> Applied and queued up for -stable, thanks! -- 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/8021q/vlan_core.c b/net/8021q/vlan_core.c index 8ca533c..830059d 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c @@ -105,7 +105,6 @@ static struct sk_buff *vlan_reorder_header(struct sk_buff *skb) return NULL; memmove(skb->data - ETH_HLEN, skb->data - VLAN_ETH_HLEN, 2 * ETH_ALEN); skb->mac_header += VLAN_HLEN; - skb_reset_mac_len(skb); return skb; } @@ -139,6 +138,8 @@ struct sk_buff *vlan_untag(struct sk_buff *skb) skb_reset_network_header(skb); skb_reset_transport_header(skb); + skb_reset_mac_len(skb); + return skb; err_free:
skb_reset_mac_len() relies on the value of the skb->network_header pointer, therefore we must wait for such pointer to be recalculated before computing the new mac_len value. Signed-off-by: Antonio Quartulli <ordex@autistici.org> --- * such bug has been found because in the batman-adv module we do check the value of mac_len to drop bad packets and we realised that all packets coming from the untagging procedure (so coming from any eth0.x) were being dropped. * I'd consider this patch to be submitted to stable Thanks, net/8021q/vlan_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)