Commit 7f290c94 authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

iptunnel: scrub packet in iptunnel_pull_header 



Part of skb_scrub_packet was open coded in iptunnel_pull_header. Let it call
skb_scrub_packet directly instead.

Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c9e78efb

drivers/net/geneve.c

+2 −2
Original line number Diff line number Diff line
@@ -237,7 +237,6 @@ static void geneve_rx(struct geneve_dev *geneve, struct geneve_sock *gs, 
	}



	skb_reset_mac_header(skb);

	skb_scrub_packet(skb, !net_eq(geneve->net, dev_net(geneve->dev)));

	skb->protocol = eth_type_trans(skb, geneve->dev);

	skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN);
@@ -356,7 +355,8 @@ static int geneve_udp_encap_recv(struct sock *sk, struct sk_buff *skb) 


	opts_len = geneveh->opt_len * 4;

	if (iptunnel_pull_header(skb, GENEVE_BASE_HLEN + opts_len,

				 htons(ETH_P_TEB)))

				 htons(ETH_P_TEB),

				 !net_eq(geneve->net, dev_net(geneve->dev))))

		goto drop;



	geneve_rx(geneve, gs, skb);

drivers/net/vxlan.c

+2 −2
Original line number Diff line number Diff line
@@ -1198,7 +1198,6 @@ static void vxlan_rcv(struct vxlan_dev *vxlan, struct vxlan_sock *vs, 
	int err = 0;



	skb_reset_mac_header(skb);

	skb_scrub_packet(skb, !net_eq(vxlan->net, dev_net(vxlan->dev)));

	skb->protocol = eth_type_trans(skb, vxlan->dev);

	skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN);
@@ -1305,7 +1304,8 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb) 
	if (!vxlan)

		goto drop;



	if (iptunnel_pull_header(skb, VXLAN_HLEN, htons(ETH_P_TEB)))

	if (iptunnel_pull_header(skb, VXLAN_HLEN, htons(ETH_P_TEB),

				 !net_eq(vxlan->net, dev_net(vxlan->dev))))

		goto drop;



	if (vxlan_collect_metadata(vs)) {

include/net/ip_tunnels.h

+2 −1
Original line number Diff line number Diff line
@@ -270,7 +270,8 @@ static inline u8 ip_tunnel_ecn_encap(u8 tos, const struct iphdr *iph, 
	return INET_ECN_encapsulate(tos, inner);

}



int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto);

int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto,

			 bool xnet);

void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,

		   __be32 src, __be32 dst, u8 proto,

		   u8 tos, u8 ttl, __be16 df, bool xnet);

net/ipv4/ip_gre.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static int parse_gre_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, 
				return -EINVAL;

		}

	}

	return iptunnel_pull_header(skb, hdr_len, tpi->proto);

	return iptunnel_pull_header(skb, hdr_len, tpi->proto, false);

}



static void ipgre_err(struct sk_buff *skb, u32 info,

net/ipv4/ip_tunnel_core.c

+3 −5
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb, 
}

EXPORT_SYMBOL_GPL(iptunnel_xmit);



int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto)

int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto,

			 bool xnet)

{

	if (unlikely(!pskb_may_pull(skb, hdr_len)))

		return -ENOMEM;
@@ -109,13 +110,10 @@ int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto) 
		skb->protocol = inner_proto;

	}



	nf_reset(skb);

	secpath_reset(skb);

	skb_clear_hash_if_not_l4(skb);

	skb_dst_drop(skb);

	skb->vlan_tci = 0;

	skb_set_queue_mapping(skb, 0);

	skb->pkt_type = PACKET_HOST;

	skb_scrub_packet(skb, xnet);

	return 0;

}

EXPORT_SYMBOL_GPL(iptunnel_pull_header);