netfilter: ipvs: prefer skb_ensure_writable

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

Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c
index 7588aea..ba34ac2 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_app.c
+++ b/net/netfilter/ipvs/ip_vs_app.c
@@ -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);

diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index d1d7b24..90adca9 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -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 */

diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c
index fe69d46..5cbefa9 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_ftp.c
+++ b/net/netfilter/ipvs/ip_vs_ftp.c
@@ -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);

diff --git a/net/netfilter/ipvs/ip_vs_proto_sctp.c b/net/netfilter/ipvs/ip_vs_proto_sctp.c
index b58ddb7..a0921ad 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_proto_sctp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_sctp.c
@@ -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)) {

diff --git a/net/netfilter/ipvs/ip_vs_proto_tcp.c b/net/netfilter/ipvs/ip_vs_proto_tcp.c
index 00ce07d..089ee59 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_proto_tcp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_tcp.c
@@ -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)) {

diff --git a/net/netfilter/ipvs/ip_vs_proto_udp.c b/net/netfilter/ipvs/ip_vs_proto_udp.c
index 92c078a..de366aa 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_proto_udp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_udp.c
@@ -153,7 +153,7 @@ udp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,
        oldlen = skb->len - udphoff;
 
        /* csum_check requires unshared skb */
-       if (!skb_make_writable(skb, udphoff+sizeof(*udph)))
+       if (skb_ensure_writable(skb, udphoff + sizeof(*udph)))
                return 0;
 
        if (unlikely(cp->app != NULL)) {
@@ -236,7 +236,7 @@ udp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,
        oldlen = skb->len - udphoff;
 
        /* csum_check requires unshared skb */
-       if (!skb_make_writable(skb, udphoff+sizeof(*udph)))
+       if (skb_ensure_writable(skb, udphoff + sizeof(*udph)))
                return 0;
 
        if (unlikely(cp->app != NULL)) {

diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
index 8d6f94b..0b41d05 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@ -279,7 +279,7 @@ static inline bool decrement_ttl(struct netns_ipvs *ipvs,
                }
 
                /* don't propagate ttl change to cloned packets */
-               if (!skb_make_writable(skb, sizeof(struct ipv6hdr)))
+               if (skb_ensure_writable(skb, sizeof(struct ipv6hdr)))
                        return false;
 
                ipv6_hdr(skb)->hop_limit--;
@@ -294,7 +294,7 @@ static inline bool decrement_ttl(struct netns_ipvs *ipvs,
                }
 
                /* don't propagate ttl change to cloned packets */
-               if (!skb_make_writable(skb, sizeof(struct iphdr)))
+               if (skb_ensure_writable(skb, sizeof(struct iphdr)))
                        return false;
 
                /* Decrease ttl */
@@ -796,7 +796,7 @@ ip_vs_nat_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
        }
 
        /* copy-on-write the packet before mangling it */
-       if (!skb_make_writable(skb, sizeof(struct iphdr)))
+       if (skb_ensure_writable(skb, sizeof(struct iphdr)))
                goto tx_error;
 
        if (skb_cow(skb, rt->dst.dev->hard_header_len))
@@ -885,7 +885,7 @@ ip_vs_nat_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
        }
 
        /* copy-on-write the packet before mangling it */
-       if (!skb_make_writable(skb, sizeof(struct ipv6hdr)))
+       if (skb_ensure_writable(skb, sizeof(struct ipv6hdr)))
                goto tx_error;
 
        if (skb_cow(skb, rt->dst.dev->hard_header_len))
@@ -1404,7 +1404,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
        }
 
        /* copy-on-write the packet before mangling it */
-       if (!skb_make_writable(skb, offset))
+       if (skb_ensure_writable(skb, offset))
                goto tx_error;
 
        if (skb_cow(skb, rt->dst.dev->hard_header_len))
@@ -1493,7 +1493,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
        }
 
        /* copy-on-write the packet before mangling it */
-       if (!skb_make_writable(skb, offset))
+       if (skb_ensure_writable(skb, offset))
                goto tx_error;
 
        if (skb_cow(skb, rt->dst.dev->hard_header_len))