| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1417473038-2165-1-git-send-email-pshelar@nicira.com> Date: Mon, 1 Dec 2014 14:30:38 -0800 From: Pravin B Shelar <pshelar@...ira.com> To: davem@...emloft.net Cc: netdev@...r.kernel.org, Pravin B Shelar <pshelar@...ira.com> Subject: [PATCH net-next 2/4] vlan: Fix mac_len adjustment. skb_reset_mac_len() sets length according to ethernet and network offsets, but mpls expects mac-length to be offset to mpls header (ref. skb_mpls_header()). Therefore rather than reset we need to subtract VLAN_HLEN from mac_len. Signed-off-by: Pravin B Shelar <pshelar@...ira.com> --- net/core/skbuff.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 92116df..c45888f 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4178,7 +4178,7 @@ static int __skb_vlan_pop(struct sk_buff *skb, u16 *vlan_tci) if (skb_network_offset(skb) < ETH_HLEN) skb_set_network_header(skb, ETH_HLEN); - skb_reset_mac_len(skb); + skb->mac_len -= VLAN_HLEN; pull: __skb_pull(skb, offset); -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists