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

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

[SK_BUFF]: Use skb_reset_network_header where the skb_pull return was being used 



But only in the cases where its a newly allocated skb, i.e. one where skb->tail
is equal to skb->data, or just after skb_reserve, where this requirement is
maintained.

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

net/appletalk/aarp.c

+9 −3
Original line number Diff line number Diff line
@@ -118,7 +118,9 @@ static void __aarp_send_query(struct aarp_entry *a) 


	/* Set up the buffer */

	skb_reserve(skb, dev->hard_header_len + aarp_dl->header_length);

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

	skb_reset_network_header(skb);

	skb->h.raw	 = skb->data;

	skb_put(skb, sizeof(*eah));

	skb->protocol    = htons(ETH_P_ATALK);

	skb->dev	 = dev;

	eah		 = aarp_hdr(skb);
@@ -163,7 +165,9 @@ static void aarp_send_reply(struct net_device *dev, struct atalk_addr *us, 


	/* Set up the buffer */

	skb_reserve(skb, dev->hard_header_len + aarp_dl->header_length);

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

	skb_reset_network_header(skb);

	skb->h.raw	 = skb->data;

	skb_put(skb, sizeof(*eah));

	skb->protocol    = htons(ETH_P_ATALK);

	skb->dev	 = dev;

	eah		 = aarp_hdr(skb);
@@ -212,7 +216,9 @@ static void aarp_send_probe(struct net_device *dev, struct atalk_addr *us) 


	/* Set up the buffer */

	skb_reserve(skb, dev->hard_header_len + aarp_dl->header_length);

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

	skb_reset_network_header(skb);

	skb->h.raw	 = skb->data;

	skb_put(skb, sizeof(*eah));

	skb->protocol    = htons(ETH_P_ATALK);

	skb->dev	 = dev;

	eah		 = aarp_hdr(skb);

net/ipv4/igmp.c

+6 −2
Original line number Diff line number Diff line
@@ -314,7 +314,9 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size) 


	skb_reserve(skb, LL_RESERVED_SPACE(dev));



	skb->nh.iph = pip =(struct iphdr *)skb_put(skb, sizeof(struct iphdr)+4);

	skb_reset_network_header(skb);

	pip = skb->nh.iph;

	skb_put(skb, sizeof(struct iphdr) + 4);



	pip->version  = 4;

	pip->ihl      = (sizeof(struct iphdr)+4)>>2;
@@ -664,7 +666,9 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc, 


	skb_reserve(skb, LL_RESERVED_SPACE(dev));



	skb->nh.iph = iph = (struct iphdr *)skb_put(skb, sizeof(struct iphdr)+4);

	skb_reset_network_header(skb);

	iph = skb->nh.iph;

	skb_put(skb, sizeof(struct iphdr) + 4);



	iph->version  = 4;

	iph->ihl      = (sizeof(struct iphdr)+4)>>2;

net/ipv4/raw.c

+3 −1
Original line number Diff line number Diff line
@@ -291,7 +291,9 @@ static int raw_send_hdrinc(struct sock *sk, void *from, size_t length, 
	skb->priority = sk->sk_priority;

	skb->dst = dst_clone(&rt->u.dst);



	skb->nh.iph = iph = (struct iphdr *)skb_put(skb, length);

	skb_reset_network_header(skb);

	iph = skb->nh.iph;

	skb_put(skb, length);



	skb->ip_summed = CHECKSUM_NONE;

net/ipx/af_ipx.c

+3 −1
Original line number Diff line number Diff line
@@ -576,7 +576,9 @@ static struct sk_buff *ipxitf_adjust_skbuff(struct ipx_interface *intrfc, 
	skb2 = alloc_skb(len, GFP_ATOMIC);

	if (skb2) {

		skb_reserve(skb2, out_offset);

		skb2->nh.raw = skb2->h.raw = skb_put(skb2, skb->len);

		skb_reset_network_header(skb2);

		skb2->h.raw = skb2->data;

		skb_put(skb2, skb->len);

		memcpy(ipx_hdr(skb2), ipx_hdr(skb), skb->len);

		memcpy(skb2->cb, skb->cb, sizeof(skb->cb));

	}

net/ipx/ipx_route.c

+3 −1
Original line number Diff line number Diff line
@@ -203,7 +203,9 @@ int ipxrtr_route_packet(struct sock *sk, struct sockaddr_ipx *usipx, 
	skb->sk = sk;



	/* Fill in IPX header */

	skb->h.raw = skb->nh.raw = skb_put(skb, sizeof(struct ipxhdr));

	skb_reset_network_header(skb);

	skb->h.raw = skb->data;

	skb_put(skb, sizeof(struct ipxhdr));

	ipx = ipx_hdr(skb);

	ipx->ipx_pktsize = htons(len + sizeof(struct ipxhdr));

	IPX_SKB_CB(skb)->ipx_tctrl = 0;