lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SK_BUFF] xfrm: Use skb_set_mac_header in the memmove cases

Browse Source 
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnaldo Carvalho de Melo
2007-03-10 12:40:27 -03:00
committed by David S. Miller
parent 48d49d0ccd
commit 39f69c6f92
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv6/xfrm6_mode_tunnel.c
View File

@ -86,6 +86,7 @@ static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
static int xfrm6_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
{
int err = -EINVAL;
const unsigned char *old_mac;
if (skb->nh.raw[IP6CB(skb)->nhoff] != IPPROTO_IPV6
&& skb->nh.raw[IP6CB(skb)->nhoff] != IPPROTO_IPIP)
@ -107,8 +108,9 @@ static int xfrm6_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
ip6ip_ecn_decapsulate(skb);
skb->protocol = htons(ETH_P_IP);
}
skb->mac.raw = memmove(skb->data - skb->mac_len,
skb->mac.raw, skb->mac_len);
old_mac = skb->mac.raw;
skb_set_mac_header(skb, -skb->mac_len);
memmove(skb->mac.raw, old_mac, skb->mac_len);
skb->nh.raw = skb->data;
err = 0;