Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects 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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/ipv4/xfrm4_mode_tunnel.c
View file

@ -91,6 +91,7 @@ static int xfrm4_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
static int xfrm4_tunnel_input(struct xfrm_state *x, struct sk_buff *skb) static int xfrm4_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
{ {
struct iphdr *iph = skb->nh.iph; struct iphdr *iph = skb->nh.iph;
const unsigned char *old_mac;
int err = -EINVAL; int err = -EINVAL;
switch (iph->protocol){ switch (iph->protocol){
@ -125,8 +126,9 @@ static int xfrm4_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
skb->protocol = htons(ETH_P_IPV6); skb->protocol = htons(ETH_P_IPV6);
} }
#endif #endif
skb->mac.raw = memmove(skb->data - skb->mac_len, old_mac = skb->mac.raw;
skb->mac.raw, skb->mac_len); skb_set_mac_header(skb, -skb->mac_len);
memmove(skb->mac.raw, old_mac, skb->mac_len);
skb->nh.raw = skb->data; skb->nh.raw = skb->data;
err = 0; err = 0;

6
net/ipv6/xfrm6_mode_beet.c
View file

@ -59,6 +59,7 @@ static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb)
static int xfrm6_beet_input(struct xfrm_state *x, struct sk_buff *skb) static int xfrm6_beet_input(struct xfrm_state *x, struct sk_buff *skb)
{ {
struct ipv6hdr *ip6h; struct ipv6hdr *ip6h;
const unsigned char *old_mac;
int size = sizeof(struct ipv6hdr); int size = sizeof(struct ipv6hdr);
int err = -EINVAL; int err = -EINVAL;
@ -69,8 +70,9 @@ static int xfrm6_beet_input(struct xfrm_state *x, struct sk_buff *skb)
memmove(skb->data, skb->nh.raw, size); memmove(skb->data, skb->nh.raw, size);
skb->nh.raw = skb->data; skb->nh.raw = skb->data;
skb->mac.raw = memmove(skb->data - skb->mac_len, old_mac = skb->mac.raw;
skb->mac.raw, skb->mac_len); skb_set_mac_header(skb, -skb->mac_len);
memmove(skb->mac.raw, old_mac, skb->mac_len);
ip6h = skb->nh.ipv6h; ip6h = skb->nh.ipv6h;
ip6h->payload_len = htons(skb->len - size); ip6h->payload_len = htons(skb->len - size);

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) static int xfrm6_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
{ {
int err = -EINVAL; int err = -EINVAL;
const unsigned char *old_mac;
if (skb->nh.raw[IP6CB(skb)->nhoff] != IPPROTO_IPV6 if (skb->nh.raw[IP6CB(skb)->nhoff] != IPPROTO_IPV6
&& skb->nh.raw[IP6CB(skb)->nhoff] != IPPROTO_IPIP) && 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); ip6ip_ecn_decapsulate(skb);
skb->protocol = htons(ETH_P_IP); skb->protocol = htons(ETH_P_IP);
} }
skb->mac.raw = memmove(skb->data - skb->mac_len, old_mac = skb->mac.raw;
skb->mac.raw, skb->mac_len); skb_set_mac_header(skb, -skb->mac_len);
memmove(skb->mac.raw, old_mac, skb->mac_len);
skb->nh.raw = skb->data; skb->nh.raw = skb->data;
err = 0; err = 0;