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

Commit f11cb2c2 authored by Julian Anastasov's avatar Julian Anastasov Committed by Pablo Neira Ayuso
Browse files

ipvs: do not use skb_share_check 



We run in contexts like ip_rcv, ipv6_rcv, br_handle_frame,
do not expect shared skbs.

Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off by: Hans Schillstrom <hans@schillstrom.com>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 183dce55

net/netfilter/ipvs/ip_vs_xmit.c

+2 −43
Original line number Diff line number Diff line
@@ -421,14 +421,6 @@ ip_vs_bypass_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, 
		goto tx_error;

	}



	/*

	 * Call ip_send_check because we are not sure it is called

	 * after ip_defrag. Is copy-on-write needed?

	 */

	if (unlikely((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)) {

		ip_rt_put(rt);

		return NF_STOLEN;

	}

	ip_send_check(ip_hdr(skb));



	/* drop old route */
@@ -482,16 +474,6 @@ ip_vs_bypass_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp, 
		goto tx_error;

	}



	/*

	 * Call ip_send_check because we are not sure it is called

	 * after ip_defrag. Is copy-on-write needed?

	 */

	skb = skb_share_check(skb, GFP_ATOMIC);

	if (unlikely(skb == NULL)) {

		dst_release(&rt->dst);

		return NF_STOLEN;

	}



	/* drop old route */

	skb_dst_drop(skb);

	skb_dst_set(skb, &rt->dst);
@@ -708,7 +690,6 @@ ip_vs_nat_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp, 
	ipv6_hdr(skb)->daddr = cp->daddr.in6;



	if (!local || !skb->dev) {

		/* drop the old route when skb is not shared */

		skb_dst_drop(skb);

		skb_dst_set(skb, &rt->dst);

	} else {
@@ -814,8 +795,7 @@ ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, 
	 */

	max_headroom = LL_RESERVED_SPACE(tdev) + sizeof(struct iphdr);



	if (skb_headroom(skb) < max_headroom

	    || skb_cloned(skb) || skb_shared(skb)) {

	if (skb_headroom(skb) < max_headroom || skb_cloned(skb)) {

		struct sk_buff *new_skb =

			skb_realloc_headroom(skb, max_headroom);

		if (!new_skb) {
@@ -935,8 +915,7 @@ ip_vs_tunnel_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp, 
	 */

	max_headroom = LL_RESERVED_SPACE(tdev) + sizeof(struct ipv6hdr);



	if (skb_headroom(skb) < max_headroom

	    || skb_cloned(skb) || skb_shared(skb)) {

	if (skb_headroom(skb) < max_headroom || skb_cloned(skb)) {

		struct sk_buff *new_skb =

			skb_realloc_headroom(skb, max_headroom);

		if (!new_skb) {
@@ -1034,14 +1013,6 @@ ip_vs_dr_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, 
		goto tx_error;

	}



	/*

	 * Call ip_send_check because we are not sure it is called

	 * after ip_defrag. Is copy-on-write needed?

	 */

	if (unlikely((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)) {

		ip_rt_put(rt);

		return NF_STOLEN;

	}

	ip_send_check(ip_hdr(skb));



	/* drop old route */
@@ -1099,16 +1070,6 @@ ip_vs_dr_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp, 
		goto tx_error;

	}



	/*

	 * Call ip_send_check because we are not sure it is called

	 * after ip_defrag. Is copy-on-write needed?

	 */

	skb = skb_share_check(skb, GFP_ATOMIC);

	if (unlikely(skb == NULL)) {

		dst_release(&rt->dst);

		return NF_STOLEN;

	}



	/* drop old route */

	skb_dst_drop(skb);

	skb_dst_set(skb, &rt->dst);
@@ -1220,7 +1181,6 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, 
	ip_vs_nat_icmp(skb, pp, cp, 0);



	if (!local) {

		/* drop the old route when skb is not shared */

		skb_dst_drop(skb);

		skb_dst_set(skb, &rt->dst);

	} else
@@ -1337,7 +1297,6 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp, 
	ip_vs_nat_icmp_v6(skb, pp, cp, 0);



	if (!local || !skb->dev) {

		/* drop the old route when skb is not shared */

		skb_dst_drop(skb);

		skb_dst_set(skb, &rt->dst);

	} else {