Commit ec0974df authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: ipvs: prefer skb_ensure_writable 



It does the same thing, use it instead so we can remove skb_make_writable.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Acked-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent c1a83116

net/netfilter/ipvs/ip_vs_app.c

+2 −2
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ static inline int app_tcp_pkt_out(struct ip_vs_conn *cp, struct sk_buff *skb, 
	struct tcphdr *th;

	__u32 seq;



	if (!skb_make_writable(skb, tcp_offset + sizeof(*th)))

	if (skb_ensure_writable(skb, tcp_offset + sizeof(*th)))

		return 0;



	th = (struct tcphdr *)(skb_network_header(skb) + tcp_offset);
@@ -440,7 +440,7 @@ static inline int app_tcp_pkt_in(struct ip_vs_conn *cp, struct sk_buff *skb, 
	struct tcphdr *th;

	__u32 seq;



	if (!skb_make_writable(skb, tcp_offset + sizeof(*th)))

	if (skb_ensure_writable(skb, tcp_offset + sizeof(*th)))

		return 0;



	th = (struct tcphdr *)(skb_network_header(skb) + tcp_offset);

net/netfilter/ipvs/ip_vs_core.c

+2 −2
Original line number Diff line number Diff line
@@ -898,7 +898,7 @@ static int handle_response_icmp(int af, struct sk_buff *skb, 
	if (IPPROTO_TCP == protocol || IPPROTO_UDP == protocol ||

	    IPPROTO_SCTP == protocol)

		offset += 2 * sizeof(__u16);

	if (!skb_make_writable(skb, offset))

	if (skb_ensure_writable(skb, offset))

		goto out;



#ifdef CONFIG_IP_VS_IPV6
@@ -1288,7 +1288,7 @@ handle_response(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, 


	IP_VS_DBG_PKT(11, af, pp, skb, iph->off, "Outgoing packet");



	if (!skb_make_writable(skb, iph->len))

	if (skb_ensure_writable(skb, iph->len))

		goto drop;



	/* mangle the packet */

net/netfilter/ipvs/ip_vs_ftp.c

+2 −2
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp, 
		return 1;



	/* Linear packets are much easier to deal with. */

	if (!skb_make_writable(skb, skb->len))

	if (skb_ensure_writable(skb, skb->len))

		return 0;



	if (cp->app_data == (void *) IP_VS_FTP_PASV) {
@@ -439,7 +439,7 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp, 
		return 1;



	/* Linear packets are much easier to deal with. */

	if (!skb_make_writable(skb, skb->len))

	if (skb_ensure_writable(skb, skb->len))

		return 0;



	data = data_start = ip_vs_ftp_data_ptr(skb, ipvsh);

net/netfilter/ipvs/ip_vs_proto_sctp.c

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ sctp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp, 
#endif



	/* csum_check requires unshared skb */

	if (!skb_make_writable(skb, sctphoff + sizeof(*sctph)))

	if (skb_ensure_writable(skb, sctphoff + sizeof(*sctph)))

		return 0;



	if (unlikely(cp->app != NULL)) {
@@ -148,7 +148,7 @@ sctp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp, 
#endif



	/* csum_check requires unshared skb */

	if (!skb_make_writable(skb, sctphoff + sizeof(*sctph)))

	if (skb_ensure_writable(skb, sctphoff + sizeof(*sctph)))

		return 0;



	if (unlikely(cp->app != NULL)) {

net/netfilter/ipvs/ip_vs_proto_tcp.c

+2 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ tcp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp, 
	oldlen = skb->len - tcphoff;



	/* csum_check requires unshared skb */

	if (!skb_make_writable(skb, tcphoff+sizeof(*tcph)))

	if (skb_ensure_writable(skb, tcphoff + sizeof(*tcph)))

		return 0;



	if (unlikely(cp->app != NULL)) {
@@ -241,7 +241,7 @@ tcp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp, 
	oldlen = skb->len - tcphoff;



	/* csum_check requires unshared skb */

	if (!skb_make_writable(skb, tcphoff+sizeof(*tcph)))

	if (skb_ensure_writable(skb, tcphoff + sizeof(*tcph)))

		return 0;



	if (unlikely(cp->app != NULL)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE