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

[SK_BUFF]: Use the helpers to get the layer header pointer 



Some more cases...

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

net/ipv4/igmp.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static int igmpv3_sendpack(struct sk_buff *skb) 
{

	struct iphdr *pip = ip_hdr(skb);

	struct igmphdr *pig = igmp_hdr(skb);

	const int iplen = skb->tail - skb->nh.raw;

	const int iplen = skb->tail - skb_network_header(skb);

	const int igmplen = skb->tail - skb_transport_header(skb);



	pip->tot_len = htons(iplen);

net/ipv4/ip_output.c

+1 −1
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*)) 
		/*

		 *	Copy a block of the IP datagram.

		 */

		if (skb_copy_bits(skb, ptr, skb2->h.raw, len))

		if (skb_copy_bits(skb, ptr, skb_transport_header(skb2), len))

			BUG();

		left -= len;

net/ipv6/exthdrs.c

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ static int ipv6_rthdr_rcv(struct sk_buff **skbp) 
		kfree_skb(skb);

		*skbp = skb = skb2;

		opt = IP6CB(skb2);

		hdr = (struct ipv6_rt_hdr *) skb2->h.raw;

		hdr = (struct ipv6_rt_hdr *)skb_transport_header(skb2);

	}



	if (skb->ip_summed == CHECKSUM_COMPLETE)

net/ipv6/netfilter/nf_conntrack_reasm.c

+2 −2
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ nf_ct_frag6_reasm(struct nf_ct_frag6_queue *fq, struct net_device *dev) 


	/* We have to remove fragment header from datagram and to relocate

	 * header in order to calculate ICV correctly. */

	skb_network_header(head)[fq->nhoffset] = head->h.raw[0];

	skb_network_header(head)[fq->nhoffset] = skb_transport_header(head)[0];

	memmove(head->head + sizeof(struct frag_hdr), head->head,

		(head->data - head->head) - sizeof(struct frag_hdr));

	head->mac.raw += sizeof(struct frag_hdr);
@@ -787,7 +787,7 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb) 


	skb_set_transport_header(clone, fhoff);

	hdr = ipv6_hdr(clone);

	fhdr = (struct frag_hdr *)clone->h.raw;

	fhdr = (struct frag_hdr *)skb_transport_header(clone);



	if (!(fhdr->frag_off & htons(0xFFF9))) {

		DEBUGP("Invalid fragment offset\n");