Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d10ba34b authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[SK_BUFF]: More skb_put related skb_reset_transport_header 



This time we have to set it to skb->tail that is not anymore equal to
skb->data, so we either add a new helper or just add the skb->tail - skb->data
offset, for now do the later.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 55f79cc0

net/ipv4/igmp.c

+2 −1
Original line number Diff line number Diff line
@@ -333,7 +333,8 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size) 
	((u8*)&pip[1])[2] = 0;

	((u8*)&pip[1])[3] = 0;



	skb->h.raw = skb_put(skb, sizeof(*pig));

	skb->h.raw = skb->nh.raw + sizeof(struct iphdr) + 4;

	skb_put(skb, sizeof(*pig));

	pig = igmpv3_report_hdr(skb);

	pig->type = IGMPV3_HOST_MEMBERSHIP_REPORT;

	pig->resv1 = 0;

net/ipv4/ipvs/ip_vs_xmit.c

+2 −1
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, 
	struct iphdr  *old_iph = ip_hdr(skb);

	u8     tos = old_iph->tos;

	__be16 df = old_iph->frag_off;

	unsigned char *old_h = skb_transport_header(skb);

	struct iphdr  *iph;			/* Our new IP header */

	int    max_headroom;			/* The extra header space needed */

	int    mtu;
@@ -380,7 +381,7 @@ ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, 
		old_iph = ip_hdr(skb);

	}



	skb->h.raw = (void *) old_iph;

	skb->h.raw = old_h;



	/* fix old IP header checksum */

	ip_send_check(old_iph);

net/ipv6/mcast.c

+3 −2
Original line number Diff line number Diff line
@@ -1423,8 +1423,9 @@ static struct sk_buff *mld_newpack(struct net_device *dev, int size) 


	memcpy(skb_put(skb, sizeof(ra)), ra, sizeof(ra));



	pmr =(struct mld2_report *)skb_put(skb, sizeof(*pmr));

	skb->h.raw = (unsigned char *)pmr;

	skb_set_transport_header(skb, skb->tail - skb->data);

	skb_put(skb, sizeof(*pmr));

	pmr = (struct mld2_report *)skb_transport_header(skb);

	pmr->type = ICMPV6_MLD2_REPORT;

	pmr->resv1 = 0;

	pmr->csum = 0;

net/ipv6/ndisc.c

+12 −8
Original line number Diff line number Diff line
@@ -492,8 +492,9 @@ static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh, 
	skb_reserve(skb, LL_RESERVED_SPACE(dev));

	ip6_nd_hdr(sk, skb, dev, src_addr, daddr, IPPROTO_ICMPV6, len);



	msg = (struct nd_msg *)skb_put(skb, len);

	skb->h.raw = (unsigned char*)msg;

	skb_set_transport_header(skb, skb->tail - skb->data);

	skb_put(skb, len);

	msg = (struct nd_msg *)skb_transport_header(skb);



	msg->icmph.icmp6_type = NDISC_NEIGHBOUR_ADVERTISEMENT;

	msg->icmph.icmp6_code = 0;
@@ -583,8 +584,9 @@ void ndisc_send_ns(struct net_device *dev, struct neighbour *neigh, 
	skb_reserve(skb, LL_RESERVED_SPACE(dev));

	ip6_nd_hdr(sk, skb, dev, saddr, daddr, IPPROTO_ICMPV6, len);



	msg = (struct nd_msg *)skb_put(skb, len);

	skb->h.raw = (unsigned char*)msg;

	skb_set_transport_header(skb, skb->tail - skb->data);

	skb_put(skb, len);

	msg = (struct nd_msg *)skb_transport_header(skb);

	msg->icmph.icmp6_type = NDISC_NEIGHBOUR_SOLICITATION;

	msg->icmph.icmp6_code = 0;

	msg->icmph.icmp6_cksum = 0;
@@ -683,8 +685,9 @@ void ndisc_send_rs(struct net_device *dev, struct in6_addr *saddr, 
	skb_reserve(skb, LL_RESERVED_SPACE(dev));

	ip6_nd_hdr(sk, skb, dev, saddr, daddr, IPPROTO_ICMPV6, len);



	hdr = (struct icmp6hdr *)skb_put(skb, len);

	skb->h.raw = (unsigned char*)hdr;

	skb_set_transport_header(skb, skb->tail - skb->data);

	skb_put(skb, len);

	hdr = icmp6_hdr(skb);

	hdr->icmp6_type = NDISC_ROUTER_SOLICITATION;

	hdr->icmp6_code = 0;

	hdr->icmp6_cksum = 0;
@@ -1519,8 +1522,9 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh, 
	ip6_nd_hdr(sk, buff, dev, &saddr_buf, &ipv6_hdr(skb)->saddr,

		   IPPROTO_ICMPV6, len);



	icmph = (struct icmp6hdr *)skb_put(buff, len);

	buff->h.raw = (unsigned char*)icmph;

	skb_set_transport_header(buff, buff->tail - buff->data);

	skb_put(buff, len);

	icmph = icmp6_hdr(buff);



	memset(icmph, 0, sizeof(struct icmp6hdr));

	icmph->icmp6_type = NDISC_REDIRECT;