Netfilter/IPVS updates for net-next
Subsystems (6)
Pablo Neira Ayuso
maintainercover Netfilter/IPVS updates for net-next
Hi David,
The following patchset container Netfilter/IPVS update for net-next:
1) Add UDP tunnel support for ICMP errors in IPVS.
Julian Anastasov says:
This patchset is a followup to the commit that adds UDP/GUE tunnel:
"ipvs: allow tunneling with gue encapsulation".
What we do is to put tunnel real servers in hash table (patch 1), add function to lookup tunnels (patch 2) and use it to strip the embedded tunnel headers from ICMP errors (patch 3).
2) Extend xt_owner to match for supplementary groups, from Lukasz Pawelczyk.
3) Remove unused oif field in flow_offload_tuple object, from Taehee Yoo.
4) Release basechain counters from workqueue to skip synchronize_rcu() call. From Florian Westphal.
5) Replace skb_make_writable() by skb_ensure_writable(). Patchset from Florian Westphal.
6) Checksum support for gue encapsulation in IPVS, from Jacky Hu.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
Thanks!
----------------------------------------------------------------
The following changes since commit 7b3ed2a137b077bc0967352088b0adb6049eed20:
Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue (2019-05-30 15:17:05 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git HEAD
for you to fetch changes up to 29930e314da3833437a2ddc7b17f6a954f38d8fb:
ipvs: add checksum support for gue encapsulation (2019-05-31 18:23:52 +0200)
----------------------------------------------------------------
Florian Westphal (9):
netfilter: nf_tables: free base chain counters from worker
netfilter: bridge: convert skb_make_writable to skb_ensure_writable
netfilter: ipvs: prefer skb_ensure_writable
netfilter: conntrack, nat: prefer skb_ensure_writable
netfilter: ipv4: prefer skb_ensure_writable
netfilter: nf_tables: prefer skb_ensure_writable
netfilter: xt_HL: prefer skb_ensure_writable
netfilter: tcpmss, optstrip: prefer skb_ensure_writable
netfilter: replace skb_make_writable with skb_ensure_writable
Jacky Hu (1):
ipvs: add checksum support for gue encapsulation
Julian Anastasov (3):
ipvs: allow rs_table to contain different real server types
ipvs: add function to find tunnels
ipvs: strip udp tunnel headers from icmp errors
Lukasz Pawelczyk (1):
netfilter: xt_owner: Add supplementary groups option
Taehee Yoo (1):
netfilter: nf_flow_table: remove unnecessary variable in flow_offload_tuple
include/linux/netfilter.h | 5 - include/net/ip_vs.h | 8 ++ include/net/netfilter/nf_flow_table.h | 2 - include/uapi/linux/ip_vs.h | 7 ++ include/uapi/linux/netfilter/xt_owner.h | 7 +- net/bridge/netfilter/ebt_dnat.c | 2 +- net/bridge/netfilter/ebt_redirect.c | 2 +- net/bridge/netfilter/ebt_snat.c | 2 +- net/ipv4/netfilter/arpt_mangle.c | 2 +- net/ipv4/netfilter/ipt_ECN.c | 4 +- net/ipv4/netfilter/nf_nat_h323.c | 2 +- net/ipv4/netfilter/nf_nat_snmp_basic_main.c | 2 +- net/netfilter/core.c | 22 ---- net/netfilter/ipvs/ip_vs_app.c | 4 +- net/netfilter/ipvs/ip_vs_core.c | 72 ++++++++++++- net/netfilter/ipvs/ip_vs_ctl.c | 83 +++++++++++++-- net/netfilter/ipvs/ip_vs_ftp.c | 4 +- net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 +- net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 +- net/netfilter/ipvs/ip_vs_proto_udp.c | 4 +- net/netfilter/ipvs/ip_vs_xmit.c | 155 ++++++++++++++++++++++++---- net/netfilter/nf_conntrack_proto_sctp.c | 2 +- net/netfilter/nf_conntrack_seqadj.c | 4 +- net/netfilter/nf_flow_table_core.c | 1 - net/netfilter/nf_nat_helper.c | 4 +- net/netfilter/nf_nat_proto.c | 24 ++--- net/netfilter/nf_nat_sip.c | 2 +- net/netfilter/nf_synproxy_core.c | 2 +- net/netfilter/nf_tables_api.c | 26 ++--- net/netfilter/nfnetlink_queue.c | 2 +- net/netfilter/nft_exthdr.c | 3 +- net/netfilter/nft_payload.c | 6 +- net/netfilter/xt_DSCP.c | 8 +- net/netfilter/xt_HL.c | 4 +- net/netfilter/xt_TCPMSS.c | 2 +- net/netfilter/xt_TCPOPTSTRIP.c | 28 +++-- net/netfilter/xt_owner.c | 23 ++++- 37 files changed, 389 insertions(+), 149 deletions(-)
Pablo Neira Ayuso
maintainerPATCH 1/15 ipvs: allow rs_table to contain different real server types
From: Julian Anastasov <[email protected]>
Before now rs_table was used only for NAT real servers. Change it to allow TUN real severs from different types, possibly hashed with different port key.
--- include/net/ip_vs.h | 3 +++ net/netfilter/ipvs/ip_vs_ctl.c | 43 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 38 insertions(+), 8 deletions(-)
include/net/ip_vs.h +3 -0
@@ -1497,6 +1497,9 @@ static inline int ip_vs_todrop(struct netns_ipvs *ipvs)static inline int ip_vs_todrop (struct netns_ipvs *ipvs) {return 0 ; }#endif +#define IP_VS_DFWD_METHOD (dest) (atomic_read(&(dest)->conn_flags) & \ + IP_VS_CONN_F_FWD_MASK) +/* ip_vs_fwd_tag returns the forwarding tag of the connection */ #define IP_VS_FWD_METHOD (cp) (cp->flags & IP_VS_CONN_F_FWD_MASK)
net/netfilter/ipvs/ip_vs_ctl.c +35 -8
86 lines not on this page · raw message
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/15 ipvs: add function to find tunnels
In reply to Pablo Neira AyusoFrom: Julian Anastasov <[email protected]>
Add ip_vs_find_tunnel() to match tunnel headers by family, address and optional port. Use it to properly find the tunnel real server used in received ICMP errors.
--- include/net/ip_vs.h | 3 +++ net/netfilter/ipvs/ip_vs_core.c | 8 ++++++++ net/netfilter/ipvs/ip_vs_ctl.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+)
include/net/ip_vs.h +3 -0
@@ -1404,6 +1404,9 @@ bool ip_vs_has_real_service(struct netns_ipvs *ipvs, int af, __u16 protocol,struct ip_vs_dest *ip_vs_find_real_service (struct netns_ipvs *ipvs,int af,__u16 protocol,const union nf_inet_addr *daddr,__be16 dport); +struct ip_vs_dest *ip_vs_find_tunnel (struct netns_ipvs *ipvs,int af, +const union nf_inet_addr *daddr, +__be16 tun_port);int ip_vs_use_count_inc (void );void ip_vs_use_count_dec (void );
net/netfilter/ipvs/ip_vs_core.c +8 -0
@@ -1598,6 +1598,7 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related,struct ip_vs_proto_data *pd;unsigned int offset, offset2, ihl, verdict;bool ipip, new_cp = false; +union nf_inet_addr *raddr; *related =1 ;
@@ -1636,15 +1637,22 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related, cih =skb_header_pointer (skb, offset,sizeof (_ciph), &_ciph);if (cih ==NULL )return NF_ACCEPT ;/* The packet looks wrong, ignore */ + raddr = (union nf_inet_addr *)&cih->daddr;/* Special case for errors for IPIP packets */ ipip = false;if (cih->protocol ==IPPROTO_IPIP ) { +struct ip_vs_dest *dest; +if (unlikely (cih->frag_off &htons (IP_OFFSET )))return NF_ACCEPT ;/* Error for our IPIP must arrive at LOCAL_IN */ if (!(skb_rtable (skb)->rt_flags &RTCF_LOCAL ))return NF_ACCEPT ; + dest =ip_vs_find_tunnel (ipvs,AF_INET , raddr,0 ); +/* Only for known tunnel */ +if (!dest || dest->tun_type !=IP_VS_CONN_F_TUNNEL_TYPE_IPIP ) +return NF_ACCEPT ; offset += cih->ihl *4 ; cih =skb_header_pointer (skb, offset,sizeof (_ciph), &_ciph);if (cih ==NULL )
net/netfilter/ipvs/ip_vs_ctl.c +29 -0
@@ -617,6 +617,35 @@ struct ip_vs_dest *ip_vs_find_real_service(struct netns_ipvs *ipvs, int af,return NULL ; } +/* Find real service record by <af,addr,tun_port>. +* In case of multiple records with the same <af,addr,tun_port>, only +* the first found record is returned. +* +* To be called under RCU lock. +*/ +struct ip_vs_dest *ip_vs_find_tunnel (struct netns_ipvs *ipvs,int af, +const union nf_inet_addr *daddr, +__be16 tun_port) +{ +struct ip_vs_dest *dest; +unsigned int hash; + +/* Check for "full" addressed entries */ + hash =ip_vs_rs_hashkey (af, daddr, tun_port); + +hlist_for_each_entry_rcu (dest, &ipvs->rs_table[hash], d_list) { +if (dest->tun_port == tun_port && + dest->af == af && +ip_vs_addr_equal (af, &dest->addr, daddr) && +IP_VS_DFWD_METHOD (dest) ==IP_VS_CONN_F_TUNNEL ) { +/* HIT */ +return dest; + } + } + +return NULL ; +} +/* Lookup destination by {addr,port} in the given service * Called under RCU lock. */
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 3/15 ipvs: strip udp tunnel headers from icmp errors
In reply to Pablo Neira AyusoFrom: Julian Anastasov <[email protected]>
Recognize UDP tunnels in received ICMP errors and properly strip the tunnel headers. GUE is what we have for now.
--- net/netfilter/ipvs/ip_vs_core.c | 60 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+)
net/netfilter/ipvs/ip_vs_core.c +60 -0
@@ -39,6 +39,7 @@#include <net/tcp.h> #include <net/udp.h> #include <net/icmp.h> /* for icmp_send */ +#include <net/gue.h> #include <net/route.h> #include <net/ip6_checksum.h> #include <net/netns/generic.h> /* net_generic() */
@@ -1579,6 +1580,41 @@ ip_vs_try_to_schedule(struct netns_ipvs *ipvs, int af, struct sk_buff *skb,return 1 ; } +/* Check the UDP tunnel and return its header length */ +static int ipvs_udp_decap (struct netns_ipvs *ipvs,struct sk_buff *skb, +unsigned int offset,__u16 af, +const union nf_inet_addr *daddr,__u8 *proto) +{ +struct udphdr _udph, *udph; +struct ip_vs_dest *dest; + + udph =skb_header_pointer (skb, offset,sizeof (_udph), &_udph); +if (!udph) + goto unk; + offset +=sizeof (struct udphdr ); + dest =ip_vs_find_tunnel (ipvs, af, daddr, udph->dest); +if (!dest) + goto unk; +if (dest->tun_type ==IP_VS_CONN_F_TUNNEL_TYPE_GUE ) { +struct guehdr _gueh, *gueh; + + gueh =skb_header_pointer (skb, offset,sizeof (_gueh), &_gueh); +if (!gueh) + goto unk; +if (gueh->control !=0 || gueh->version !=0 ) + goto unk; +/* Later we can support also IPPROTO_IPV6 */ +if (gueh->proto_ctype !=IPPROTO_IPIP ) + goto unk; + *proto = gueh->proto_ctype; +return sizeof (struct udphdr ) +sizeof (struct guehdr ) + + (gueh->hlen <<2 ); + } + +unk: +return 0 ; +} +/* * Handle ICMP messages in the outside-to-inside direction (incoming). * Find any that might be relevant, check against existing connections,
@@ -1658,6 +1694,30 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related,if (cih ==NULL )return NF_ACCEPT ;/* The packet looks wrong, ignore */ ipip = true; + }else if (cih->protocol ==IPPROTO_UDP &&/* Can be UDP encap */ +/* Error for our tunnel must arrive at LOCAL_IN */ + (skb_rtable (skb)->rt_flags &RTCF_LOCAL )) { +__u8 iproto; +int ulen; + +/* Non-first fragment has no UDP header */ +if (unlikely (cih->frag_off &htons (IP_OFFSET ))) +return NF_ACCEPT ; + offset2 = offset + cih->ihl *4 ; + ulen =ipvs_udp_decap (ipvs, skb, offset2,AF_INET , raddr, + &iproto); +if (ulen >0 ) { +/* Skip IP and UDP tunnel headers */ + offset = offset2 + ulen; +/* Now we should be at the original IP header */ + cih =skb_header_pointer (skb, offset,sizeof (_ciph), + &_ciph); +if (cih && cih->version ==4 && cih->ihl >=5 && + iproto ==IPPROTO_IPIP ) + ipip = true; +else +return NF_ACCEPT ; + } } pd =ip_vs_proto_data_get (ipvs, cih->protocol);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 4/15 netfilter: xt_owner: Add supplementary groups option
In reply to Pablo Neira AyusoFrom: Lukasz Pawelczyk <[email protected]>
The XT_OWNER_SUPPL_GROUPS flag causes GIDs specified with XT_OWNER_GID to be also checked in the supplementary groups of a process.
f_cred->group_info cannot be modified during its lifetime and f_cred holds a reference to it so it's safe to use.
--- include/uapi/linux/netfilter/xt_owner.h | 7 ++++--- net/netfilter/xt_owner.c | 23 ++++++++++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-)
include/uapi/linux/netfilter/xt_owner.h +4 -3
@@ -5,9 +5,10 @@#include <linux/types.h> enum { -XT_OWNER_UID =1 <<0 , -XT_OWNER_GID =1 <<1 , -XT_OWNER_SOCKET =1 <<2 , +XT_OWNER_UID =1 <<0 , +XT_OWNER_GID =1 <<1 , +XT_OWNER_SOCKET =1 <<2 , +XT_OWNER_SUPPL_GROUPS =1 <<3 , };struct xt_owner_match_info {
net/netfilter/xt_owner.c +20 -3
@@ -91,11 +91,28 @@ owner_mt(const struct sk_buff *skb, struct xt_action_param *par) }if (info->match &XT_OWNER_GID ) { +unsigned int i, match = false;kgid_t gid_min =make_kgid (net->user_ns, info->gid_min);kgid_t gid_max =make_kgid (net->user_ns, info->gid_max); -if ((gid_gte (filp->f_cred->fsgid, gid_min) && -gid_lte (filp->f_cred->fsgid, gid_max)) ^ - !(info->invert &XT_OWNER_GID )) +struct group_info *gi = filp->f_cred->group_info; + +if (gid_gte (filp->f_cred->fsgid, gid_min) && +gid_lte (filp->f_cred->fsgid, gid_max)) + match = true; + +if (!match && (info->match &XT_OWNER_SUPPL_GROUPS ) && gi) { +for (i =0 ; i < gi->ngroups; ++i) { +kgid_t group = gi->gid[i]; + +if (gid_gte (group, gid_min) && +gid_lte (group, gid_max)) { + match = true; +break ; + } + } + } + +if (match ^ !(info->invert &XT_OWNER_GID ))return false; }
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 5/15 netfilter: nf_flow_table: remove unnecessary variable in flow_offload_tuple
In reply to Pablo Neira AyusoFrom: Taehee Yoo <[email protected]>
The oifidx in the struct flow_offload_tuple is not used anymore.
--- include/net/netfilter/nf_flow_table.h | 2 -- net/netfilter/nf_flow_table_core.c | 1 - 2 files changed, 3 deletions(-)
include/net/netfilter/nf_flow_table.h +0 -2
@@ -53,8 +53,6 @@ struct flow_offload_tuple {u8 l4proto;u8 dir; -int oifidx; -u16 mtu;struct dst_entry *dst_cache;
net/netfilter/nf_flow_table_core.c +0 -1
@@ -53,7 +53,6 @@ flow_offload_fill_dir(struct flow_offload *flow, struct nf_conn *ct, ft->dst_port = ctt->dst.u.tcp.port; ft->iifidx = other_dst->dev->ifindex; - ft->oifidx = dst->dev->ifindex; ft->dst_cache = dst; }
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 6/15 netfilter: nf_tables: free base chain counters from worker
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
No need to use synchronize_rcu() here, just swap the two pointers and have the release occur from work queue after commit has completed.
--- net/netfilter/nf_tables_api.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-)
net/netfilter/nf_tables_api.c +10 -16
@@ -1449,25 +1449,18 @@ static struct nft_stats __percpu *nft_stats_alloc(const struct nlattr *attr)return newstats; } -static void nft_chain_stats_replace (struct net *net, -struct nft_base_chain *chain, -struct nft_stats __percpu *newstats) +static void nft_chain_stats_replace (struct nft_trans *trans) { -struct nft_stats __percpu *oldstats; +struct nft_base_chain *chain =nft_base_chain (trans->ctx.chain); -if (newstats ==NULL ) +if (!nft_trans_chain_stats (trans))return ; -if (rcu_access_pointer (chain->stats)) { - oldstats =rcu_dereference_protected (chain->stats, -lockdep_commit_lock_is_held (net)); -rcu_assign_pointer (chain->stats, newstats); -synchronize_rcu (); -free_percpu (oldstats); - }else { -rcu_assign_pointer (chain->stats, newstats); +rcu_swap_protected (chain->stats,nft_trans_chain_stats (trans), +lockdep_commit_lock_is_held (trans->ctx.net)); + +if (!nft_trans_chain_stats (trans))static_branch_inc (&nft_counters_enabled); - } }static void nf_tables_chain_free_chain_rules (struct nft_chain *chain)
@@ -6360,9 +6353,9 @@ static void nft_chain_commit_update(struct nft_trans *trans)if (!nft_is_base_chain (trans->ctx.chain))return ; +nft_chain_stats_replace (trans); + basechain =nft_base_chain (trans->ctx.chain); -nft_chain_stats_replace (trans->ctx.net, basechain, -nft_trans_chain_stats (trans));switch (nft_trans_chain_policy (trans)) {case NF_DROP :
@@ -6379,6 +6372,7 @@ static void nft_commit_release(struct nft_trans *trans)nf_tables_table_destroy (&trans->ctx);break ;case NFT_MSG_NEWCHAIN : +free_percpu (nft_trans_chain_stats (trans));kfree (nft_trans_chain_name (trans));break ;case NFT_MSG_DELCHAIN :
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 7/15 netfilter: bridge: convert skb_make_writable to skb_ensure_writable
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
Back in the day, skb_ensure_writable did not exist. By now, both functions have the same precondition:
I. skb_make_writable will test in this order:
1. wlen > skb->len -> error
2. if not cloned and wlen <= headlen -> OK
3. If cloned and wlen bytes of clone writeable -> OK
After those checks, skb is either not cloned but needs to pull from nonlinear area, or writing to head would also alter data of another clone.
In both cases skb_make_writable will then call __pskb_pull_tail, which will kmalloc a new memory area to use for skb->head.
IOW, after successful skb_make_writable call, the requested length is in linear area and can be modified, even if skb was cloned.
II. skb_ensure_writable will do this instead:
1. call pskb_may_pull. This handles case 1 above. After this, wlen is in linear area, but skb might be cloned.
2. return if skb is not cloned
3. return if wlen byte of clone are writeable.
4. fully copy the skb.
So post-conditions are the same:
*len bytes are writeable in linear area without altering any payload data of a clone, all header pointers might have been changed.
Only differences are that skb_ensure_writable is in the core, whereas skb_make_writable lives in netfilter core and the inverted return value. skb_make_writable returns 0 on error, whereas skb_ensure_writable returns negative value.
For the normal cases performance is similar:
A. skb is not cloned and in linear area:
pskb_may_pull is inline helper, so neither function copies.
B. skb is cloned, write is in linear area and clone is writeable:
both funcions return with step 3.
This series removes skb_make_writable from the kernel.
While at it, pass the needed value instead, its less confusing that way:
There is no special-handling of "0-length" argument in either skb_make_writable or skb_ensure_writable.
bridge already makes sure ethernet header is in linear area, only purpose of the make_writable() is is to copy skb->head in case of cloned skbs.
--- net/bridge/netfilter/ebt_dnat.c | 2 +- net/bridge/netfilter/ebt_redirect.c | 2 +- net/bridge/netfilter/ebt_snat.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
net/bridge/netfilter/ebt_dnat.c +1 -1
@@ -22,7 +22,7 @@ ebt_dnat_tg(struct sk_buff *skb, const struct xt_action_param *par)const struct ebt_nat_info *info = par->targinfo;struct net_device *dev; -if (!skb_make_writable (skb,0 )) +if (skb_ensure_writable (skb,ETH_ALEN ))return EBT_DROP ;ether_addr_copy (eth_hdr (skb)->h_dest, info->mac);
net/bridge/netfilter/ebt_redirect.c +1 -1
@@ -21,7 +21,7 @@ ebt_redirect_tg(struct sk_buff *skb, const struct xt_action_param *par) {const struct ebt_redirect_info *info = par->targinfo; -if (!skb_make_writable (skb,0 )) +if (skb_ensure_writable (skb,ETH_ALEN ))return EBT_DROP ;if (xt_hooknum (par) !=NF_BR_BROUTING )
net/bridge/netfilter/ebt_snat.c +1 -1
@@ -22,7 +22,7 @@ ebt_snat_tg(struct sk_buff *skb, const struct xt_action_param *par) {const struct ebt_nat_info *info = par->targinfo; -if (!skb_make_writable (skb,0 )) +if (skb_ensure_writable (skb,ETH_ALEN *2 ))return EBT_DROP ;ether_addr_copy (eth_hdr (skb)->h_source, info->mac);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 8/15 netfilter: ipvs: prefer skb_ensure_writable
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
It does the same thing, use it instead so we can remove skb_make_writable.
--- net/netfilter/ipvs/ip_vs_app.c | 4 ++-- net/netfilter/ipvs/ip_vs_core.c | 4 ++-- net/netfilter/ipvs/ip_vs_ftp.c | 4 ++-- net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 ++-- net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 ++-- net/netfilter/ipvs/ip_vs_proto_udp.c | 4 ++-- net/netfilter/ipvs/ip_vs_xmit.c | 12 ++++++------ 7 files changed, 18 insertions(+), 18 deletions(-)
net/netfilter/ipvs/ip_vs_app.c +2 -2
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 )) {
net/netfilter/ipvs/ip_vs_proto_udp.c +2 -2
@@ -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 )) {
net/netfilter/ipvs/ip_vs_xmit.c +6 -6
@@ -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))
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 9/15 netfilter: conntrack, nat: prefer skb_ensure_writable
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
like previous patches -- convert conntrack to use the core helper.
--- net/netfilter/nf_conntrack_proto_sctp.c | 2 +- net/netfilter/nf_conntrack_seqadj.c | 4 ++-- net/netfilter/nf_nat_helper.c | 4 ++-- net/netfilter/nf_nat_proto.c | 24 ++++++++++++------------ 4 files changed, 17 insertions(+), 17 deletions(-)
net/netfilter/nf_conntrack_proto_sctp.c +1 -1
@@ -339,7 +339,7 @@ static bool sctp_error(struct sk_buff *skb,if (state->hook ==NF_INET_PRE_ROUTING && state->net->ct.sysctl_checksum && skb->ip_summed ==CHECKSUM_NONE ) { -if (!skb_make_writable (skb, dataoff +sizeof (struct sctphdr ))) { +if (skb_ensure_writable (skb, dataoff +sizeof (*sh))) { logmsg ="nf_ct_sctp: failed to read header " ; goto out_invalid; }
net/netfilter/nf_conntrack_seqadj.c +2 -2
@@ -126,7 +126,7 @@ static unsigned int nf_ct_sack_adjust(struct sk_buff *skb, optoff = protoff +sizeof (struct tcphdr ); optend = protoff + tcph->doff *4 ; -if (!skb_make_writable (skb, optend)) +if (skb_ensure_writable (skb, optend))return 0 ; tcph = (void *)skb->data + protoff;
@@ -176,7 +176,7 @@ int nf_ct_seq_adjust(struct sk_buff *skb, this_way = &seqadj->seq[dir]; other_way = &seqadj->seq[!dir]; -if (!skb_make_writable (skb, protoff +sizeof (*tcph))) +if (skb_ensure_writable (skb, protoff +sizeof (*tcph)))return 0 ; tcph = (void *)skb->data + protoff;
net/netfilter/nf_nat_helper.c +2 -2
@@ -98,7 +98,7 @@ bool __nf_nat_mangle_tcp_packet(struct sk_buff *skb,struct tcphdr *tcph;int oldlen, datalen; -if (!skb_make_writable (skb, skb->len)) +if (skb_ensure_writable (skb, skb->len))return false; if (rep_len > match_len &&
@@ -148,7 +148,7 @@ nf_nat_mangle_udp_packet(struct sk_buff *skb,struct udphdr *udph;int datalen, oldlen; -if (!skb_make_writable (skb, skb->len)) +if (skb_ensure_writable (skb, skb->len))return false; if (rep_len > match_len &&
net/netfilter/nf_nat_proto.c +12 -12
@@ -73,7 +73,7 @@ static bool udp_manip_pkt(struct sk_buff *skb,struct udphdr *hdr;bool do_csum; -if (!skb_make_writable (skb, hdroff +sizeof (*hdr))) +if (skb_ensure_writable (skb, hdroff +sizeof (*hdr)))return false; hdr = (struct udphdr *)(skb->data + hdroff);
@@ -91,7 +91,7 @@ static bool udplite_manip_pkt(struct sk_buff *skb,#ifdef CONFIG_NF_CT_PROTO_UDPLITE struct udphdr *hdr; -if (!skb_make_writable (skb, hdroff +sizeof (*hdr))) +if (skb_ensure_writable (skb, hdroff +sizeof (*hdr)))return false; hdr = (struct udphdr *)(skb->data + hdroff);
@@ -117,7 +117,7 @@ sctp_manip_pkt(struct sk_buff *skb,if (skb->len >= hdroff +sizeof (*hdr)) hdrsize =sizeof (*hdr); -if (!skb_make_writable (skb, hdroff + hdrsize)) +if (skb_ensure_writable (skb, hdroff + hdrsize))return false; hdr = (struct sctphdr *)(skb->data + hdroff);
@@ -158,7 +158,7 @@ tcp_manip_pkt(struct sk_buff *skb,if (skb->len >= hdroff +sizeof (struct tcphdr )) hdrsize =sizeof (struct tcphdr ); -if (!skb_make_writable (skb, hdroff + hdrsize)) +if (skb_ensure_writable (skb, hdroff + hdrsize))return false; hdr = (struct tcphdr *)(skb->data + hdroff);
@@ -198,7 +198,7 @@ dccp_manip_pkt(struct sk_buff *skb,if (skb->len >= hdroff +sizeof (struct dccp_hdr )) hdrsize =sizeof (struct dccp_hdr ); -if (!skb_make_writable (skb, hdroff + hdrsize)) +if (skb_ensure_writable (skb, hdroff + hdrsize))return false; hdr = (struct dccp_hdr *)(skb->data + hdroff);
@@ -232,7 +232,7 @@ icmp_manip_pkt(struct sk_buff *skb, {struct icmphdr *hdr; -if (!skb_make_writable (skb, hdroff +sizeof (*hdr))) +if (skb_ensure_writable (skb, hdroff +sizeof (*hdr)))return false; hdr = (struct icmphdr *)(skb->data + hdroff);
@@ -250,7 +250,7 @@ icmpv6_manip_pkt(struct sk_buff *skb, {struct icmp6hdr *hdr; -if (!skb_make_writable (skb, hdroff +sizeof (*hdr))) +if (skb_ensure_writable (skb, hdroff +sizeof (*hdr)))return false; hdr = (struct icmp6hdr *)(skb->data + hdroff);
@@ -278,7 +278,7 @@ gre_manip_pkt(struct sk_buff *skb,/* pgreh includes two optional 32bit fields which are not required * to be there. That's where the magic '8' comes from */ -if (!skb_make_writable (skb, hdroff +sizeof (*pgreh) -8 )) +if (skb_ensure_writable (skb, hdroff +sizeof (*pgreh) -8 ))return false; greh = (void *)skb->data + hdroff;
@@ -350,7 +350,7 @@ static bool nf_nat_ipv4_manip_pkt(struct sk_buff *skb,struct iphdr *iph;unsigned int hdroff; -if (!skb_make_writable (skb, iphdroff +sizeof (*iph))) +if (skb_ensure_writable (skb, iphdroff +sizeof (*iph)))return false; iph = (void *)skb->data + iphdroff;
@@ -381,7 +381,7 @@ static bool nf_nat_ipv6_manip_pkt(struct sk_buff *skb,int hdroff;u8 nexthdr; -if (!skb_make_writable (skb, iphdroff +sizeof (*ipv6h))) +if (skb_ensure_writable (skb, iphdroff +sizeof (*ipv6h)))return false; ipv6h = (void *)skb->data + iphdroff;
@@ -565,7 +565,7 @@ int nf_nat_icmp_reply_translation(struct sk_buff *skb,WARN_ON (ctinfo !=IP_CT_RELATED && ctinfo !=IP_CT_RELATED_REPLY ); -if (!skb_make_writable (skb, hdrlen +sizeof (*inside))) +if (skb_ensure_writable (skb, hdrlen +sizeof (*inside)))return 0 ;if (nf_ip_checksum (skb, hooknum, hdrlen,0 ))return 0 ;
@@ -787,7 +787,7 @@ int nf_nat_icmpv6_reply_translation(struct sk_buff *skb,WARN_ON (ctinfo !=IP_CT_RELATED && ctinfo !=IP_CT_RELATED_REPLY ); -if (!skb_make_writable (skb, hdrlen +sizeof (*inside))) +if (skb_ensure_writable (skb, hdrlen +sizeof (*inside)))return 0 ;if (nf_ip6_checksum (skb, hooknum, hdrlen,IPPROTO_ICMPV6 ))return 0 ;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 10/15 netfilter: ipv4: prefer skb_ensure_writable
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
.. so skb_make_writable can be removed soon.
--- net/ipv4/netfilter/arpt_mangle.c | 2 +- net/ipv4/netfilter/ipt_ECN.c | 4 ++-- net/ipv4/netfilter/nf_nat_h323.c | 2 +- net/ipv4/netfilter/nf_nat_snmp_basic_main.c | 2 +- net/netfilter/nf_nat_sip.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
net/ipv4/netfilter/arpt_mangle.c +1 -1
@@ -17,7 +17,7 @@ target(struct sk_buff *skb, const struct xt_action_param *par)unsigned char *arpptr;int pln, hln; -if (!skb_make_writable (skb, skb->len)) +if (skb_ensure_writable (skb, skb->len))return NF_DROP ; arp =arp_hdr (skb);
net/ipv4/netfilter/ipt_ECN.c +2 -2
@@ -32,7 +32,7 @@ set_ect_ip(struct sk_buff *skb, const struct ipt_ECN_info *einfo)if ((iph->tos &IPT_ECN_IP_MASK ) != (einfo->ip_ect &IPT_ECN_IP_MASK )) {__u8 oldtos; -if (!skb_make_writable (skb,sizeof (struct iphdr ))) +if (skb_ensure_writable (skb,sizeof (struct iphdr )))return false; iph =ip_hdr (skb); oldtos = iph->tos;
@@ -61,7 +61,7 @@ set_ect_tcp(struct sk_buff *skb, const struct ipt_ECN_info *einfo) tcph->cwr == einfo->proto.tcp.cwr))return true; -if (!skb_make_writable (skb,ip_hdrlen (skb) +sizeof (*tcph))) +if (skb_ensure_writable (skb,ip_hdrlen (skb) +sizeof (*tcph)))return false; tcph = (void *)ip_hdr (skb) +ip_hdrlen (skb);
net/ipv4/netfilter/nf_nat_h323.c +1 -1
@@ -59,7 +59,7 @@ static int set_addr(struct sk_buff *skb, unsigned int protoff,net_notice_ratelimited ("nf_nat_h323: nf_nat_mangle_udp_packet error\n" );return -1 ; } -/* nf_nat_mangle_udp_packet uses skb_make_writable() to copy +/* nf_nat_mangle_udp_packet uses skb_ensure_writable() to copy * or pull everything in a linear buffer, so we can safely * use the skb pointers now */ *data = skb->data +ip_hdrlen (skb) +sizeof (struct udphdr );
net/ipv4/netfilter/nf_nat_snmp_basic_main.c +1 -1
@@ -186,7 +186,7 @@ static int help(struct sk_buff *skb, unsigned int protoff,return NF_DROP ; } -if (!skb_make_writable (skb, skb->len)) { +if (skb_ensure_writable (skb, skb->len)) {nf_ct_helper_log (skb, ct,"cannot mangle packet" );return NF_DROP ; }
net/netfilter/nf_nat_sip.c +1 -1
@@ -285,7 +285,7 @@ static unsigned int nf_nat_sip(struct sk_buff *skb, unsigned int protoff,if (dir ==IP_CT_DIR_REPLY && ct_sip_info->forced_dport) {struct udphdr *uh; -if (!skb_make_writable (skb, skb->len)) { +if (skb_ensure_writable (skb, skb->len)) {nf_ct_helper_log (skb, ct,"cannot mangle packet" );return NF_DROP ; }
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 11/15 netfilter: nf_tables: prefer skb_ensure_writable
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
.. so skb_make_writable can be removed.
--- net/netfilter/nft_exthdr.c | 3 ++- net/netfilter/nft_payload.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-)
net/netfilter/nft_exthdr.c +2 -1
@@ -156,7 +156,8 @@ static void nft_exthdr_tcp_set_eval(const struct nft_expr *expr,if (i + optl > tcphdr_len || priv->len + priv->offset > optl)return ; -if (!skb_make_writable (pkt->skb, pkt->xt.thoff + i + priv->len)) +if (skb_ensure_writable (pkt->skb, + pkt->xt.thoff + i + priv->len))return ; tcph = nft_tcp_header_pointer(pkt, sizeof(buff), buff,
net/netfilter/nft_payload.c +3 -3
@@ -243,7 +243,7 @@ static int nft_payload_l4csum_update(const struct nft_pktinfo *pkt, tsum)); } -if (!skb_make_writable (skb, l4csum_offset +sizeof (sum)) || +if (skb_ensure_writable (skb, l4csum_offset +sizeof (sum)) ||skb_store_bits (skb, l4csum_offset, &sum,sizeof (sum)) <0 )return -1 ;
@@ -259,7 +259,7 @@ static int nft_payload_csum_inet(struct sk_buff *skb, const u32 *src,return -1 ;nft_csum_replace (&sum, fsum, tsum); -if (!skb_make_writable (skb, csum_offset +sizeof (sum)) || +if (skb_ensure_writable (skb, csum_offset +sizeof (sum)) ||skb_store_bits (skb, csum_offset, &sum,sizeof (sum)) <0 )return -1 ;
@@ -312,7 +312,7 @@ static void nft_payload_set_eval(const struct nft_expr *expr, goto err; } -if (!skb_make_writable (skb,max (offset + priv->len,0 )) || +if (skb_ensure_writable (skb,max (offset + priv->len,0 )) ||skb_store_bits (skb, offset, src, priv->len) <0 ) goto err;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 12/15 netfilter: xt_HL: prefer skb_ensure_writable
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
Also, make the argument to be only the needed size of the header we're altering, no need to pull in the full packet into linear area.
--- net/netfilter/xt_HL.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/xt_HL.c +2 -2
@@ -32,7 +32,7 @@ ttl_tg(struct sk_buff *skb, const struct xt_action_param *par)const struct ipt_TTL_info *info = par->targinfo;int new_ttl; -if (!skb_make_writable (skb, skb->len)) +if (skb_ensure_writable (skb,sizeof (*iph)))return NF_DROP ; iph =ip_hdr (skb);
@@ -72,7 +72,7 @@ hl_tg6(struct sk_buff *skb, const struct xt_action_param *par)const struct ip6t_HL_info *info = par->targinfo;int new_hl; -if (!skb_make_writable (skb, skb->len)) +if (skb_ensure_writable (skb,sizeof (*ip6h)))return NF_DROP ; ip6h =ipv6_hdr (skb);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 13/15 netfilter: tcpmss, optstrip: prefer skb_ensure_writable
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
This also changes optstrip to only make the tcp header writeable rather than the entire packet.
--- net/netfilter/xt_TCPMSS.c | 2 +- net/netfilter/xt_TCPOPTSTRIP.c | 28 +++++++++++++--------------- 2 files changed, 14 insertions(+), 16 deletions(-)
net/netfilter/xt_TCPMSS.c +1 -1
@@ -89,7 +89,7 @@ tcpmss_mangle_packet(struct sk_buff *skb,if (par->fragoff !=0 )return 0 ; -if (!skb_make_writable (skb, skb->len)) +if (skb_ensure_writable (skb, skb->len))return -1 ; len = skb->len - tcphoff;
net/netfilter/xt_TCPOPTSTRIP.c +13 -15
@@ -31,33 +31,33 @@ static inline unsigned int optlen(const u_int8_t *opt, unsigned int offset)static unsigned int tcpoptstrip_mangle_packet (struct sk_buff *skb,const struct xt_action_param *par, -unsigned int tcphoff,unsigned int minlen) +unsigned int tcphoff) {const struct xt_tcpoptstrip_target_info *info = par->targinfo; +struct tcphdr *tcph, _th;unsigned int optl, i, j; -struct tcphdr *tcph;u_int16_t n, o;u_int8_t *opt; -int len, tcp_hdrlen; +int tcp_hdrlen;/* This is a fragment, no TCP header is available */ if (par->fragoff !=0 )return XT_CONTINUE ; -if (!skb_make_writable (skb, skb->len)) + tcph =skb_header_pointer (skb, tcphoff,sizeof (_th), &_th); +if (!tcph)return NF_DROP ; - len = skb->len - tcphoff; -if (len < (int )sizeof (struct tcphdr )) -return NF_DROP ; - - tcph = (struct tcphdr *)(skb_network_header (skb) + tcphoff); tcp_hdrlen = tcph->doff *4 ; +if (tcp_hdrlen <sizeof (struct tcphdr )) +return NF_DROP ; -if (len < tcp_hdrlen) +if (skb_ensure_writable (skb, tcphoff + tcp_hdrlen))return NF_DROP ; - opt = (u_int8_t *)tcph; +/* must reload tcph, might have been moved */ + tcph = (struct tcphdr *)(skb_network_header (skb) + tcphoff); + opt = (u8 *)tcph;/* * Walk through all TCP options - if we find some option to remove,
@@ -91,8 +91,7 @@ tcpoptstrip_mangle_packet(struct sk_buff *skb,static unsigned int tcpoptstrip_tg4 (struct sk_buff *skb,const struct xt_action_param *par) { -return tcpoptstrip_mangle_packet (skb, par,ip_hdrlen (skb), -sizeof (struct iphdr ) +sizeof (struct tcphdr )); +return tcpoptstrip_mangle_packet (skb, par,ip_hdrlen (skb)); }#if IS_ENABLED (CONFIG_IP6_NF_MANGLE )
@@ -109,8 +108,7 @@ tcpoptstrip_tg6(struct sk_buff *skb, const struct xt_action_param *par)if (tcphoff <0 )return NF_DROP ; -return tcpoptstrip_mangle_packet (skb, par, tcphoff, - sizeof(*ipv6h) + sizeof(struct tcphdr)); + return tcpoptstrip_mangle_packet(skb, par, tcphoff); }#endif
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 14/15 netfilter: replace skb_make_writable with skb_ensure_writable
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
This converts all remaining users and then removes skb_make_writable.
--- include/linux/netfilter.h | 5 ----- net/netfilter/core.c | 22 ---------------------- net/netfilter/nf_synproxy_core.c | 2 +- net/netfilter/nfnetlink_queue.c | 2 +- net/netfilter/xt_DSCP.c | 8 ++++---- 5 files changed, 6 insertions(+), 33 deletions(-)
include/linux/netfilter.h +0 -5
@@ -336,11 +336,6 @@ int compat_nf_getsockopt(struct sock *sk, u_int8_t pf, int optval, char __user *opt, int *len);#endif -/* Call this before modifying an existing packet: ensures it is -modifiable and linear to the point you care about (writable_len). -Returns true or false. */ -int skb_make_writable (struct sk_buff *skb,unsigned int writable_len); -struct flowi ;struct nf_queue_entry ;
net/netfilter/core.c +0 -22
@@ -536,28 +536,6 @@ int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state, }EXPORT_SYMBOL (nf_hook_slow); - -int skb_make_writable (struct sk_buff *skb,unsigned int writable_len) -{ -if (writable_len > skb->len) -return 0 ; - -/* Not exclusive use of packet? Must copy. */ -if (!skb_cloned (skb)) { -if (writable_len <=skb_headlen (skb)) -return 1 ; - }else if (skb_clone_writable (skb, writable_len)) -return 1 ; - -if (writable_len <=skb_headlen (skb)) - writable_len =0 ; -else - writable_len -=skb_headlen (skb); - -return !!__pskb_pull_tail (skb, writable_len); -} -EXPORT_SYMBOL (skb_make_writable); -/* This needs to be compiled in any case to avoid dependencies between the * nfnetlink_queue code and nf_conntrack. */
net/netfilter/nf_synproxy_core.c +1 -1
@@ -196,7 +196,7 @@ unsigned int synproxy_tstamp_adjust(struct sk_buff *skb, optoff = protoff +sizeof (struct tcphdr ); optend = protoff + th->doff *4 ; -if (!skb_make_writable (skb, optend)) +if (skb_ensure_writable (skb, optend))return 0 ;while (optoff < optend) {
net/netfilter/nfnetlink_queue.c +1 -1
@@ -863,7 +863,7 @@ nfqnl_mangle(void *data, int data_len, struct nf_queue_entry *e, int diff) }skb_put (e->skb, diff); } -if (!skb_make_writable (e->skb, data_len)) +if (skb_ensure_writable (e->skb, data_len))return -ENOMEM ;skb_copy_to_linear_data (e->skb, data, data_len); e->skb->ip_summed =CHECKSUM_NONE ;
net/netfilter/xt_DSCP.c +4 -4
@@ -34,7 +34,7 @@ dscp_tg(struct sk_buff *skb, const struct xt_action_param *par)u_int8_t dscp =ipv4_get_dsfield (ip_hdr (skb)) >>XT_DSCP_SHIFT ;if (dscp != dinfo->dscp) { -if (!skb_make_writable (skb,sizeof (struct iphdr ))) +if (skb_ensure_writable (skb,sizeof (struct iphdr )))return NF_DROP ; ipv4_change_dsfield(ip_hdr(skb),
@@ -52,7 +52,7 @@ dscp_tg6(struct sk_buff *skb, const struct xt_action_param *par)u_int8_t dscp =ipv6_get_dsfield (ipv6_hdr (skb)) >>XT_DSCP_SHIFT ;if (dscp != dinfo->dscp) { -if (!skb_make_writable (skb,sizeof (struct ipv6hdr ))) +if (skb_ensure_writable (skb,sizeof (struct ipv6hdr )))return NF_DROP ; ipv6_change_dsfield(ipv6_hdr(skb),
@@ -82,7 +82,7 @@ tos_tg(struct sk_buff *skb, const struct xt_action_param *par) nv = (orig & ~info->tos_mask) ^ info->tos_value;if (orig != nv) { -if (!skb_make_writable (skb,sizeof (struct iphdr ))) +if (skb_ensure_writable (skb,sizeof (struct iphdr )))return NF_DROP ; iph =ip_hdr (skb);ipv4_change_dsfield (iph,0 , nv);
@@ -102,7 +102,7 @@ tos_tg6(struct sk_buff *skb, const struct xt_action_param *par) nv = (orig & ~info->tos_mask) ^ info->tos_value;if (orig != nv) { -if (!skb_make_writable (skb,sizeof (struct iphdr ))) +if (skb_ensure_writable (skb,sizeof (struct iphdr )))return NF_DROP ; iph =ipv6_hdr (skb);ipv6_change_dsfield (iph,0 , nv);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 15/15 ipvs: add checksum support for gue encapsulation
In reply to Pablo Neira AyusoFrom: Jacky Hu <[email protected]>
Add checksum support for gue encapsulation with the tun_flags parameter, which could be one of the values below:IP_VS_TUNNEL_ENCAP_FLAG_NOCSUMIP_VS_TUNNEL_ENCAP_FLAG_CSUMIP_VS_TUNNEL_ENCAP_FLAG_REMCSUM
--- include/net/ip_vs.h | 2 + include/uapi/linux/ip_vs.h | 7 ++ net/netfilter/ipvs/ip_vs_ctl.c | 11 +++- net/netfilter/ipvs/ip_vs_xmit.c | 143 +++++++++++++++++++++++++++++++++++----- 4 files changed, 146 insertions(+), 17 deletions(-)
include/net/ip_vs.h +2 -0
@@ -603,6 +603,7 @@ struct ip_vs_dest_user_kern {u16 tun_type;/* tunnel type */ __be16 tun_port;/* tunnel port */ +u16 tun_flags;/* tunnel flags */ };
@@ -665,6 +666,7 @@ struct ip_vs_dest {atomic_t last_weight;/* server latest weight */ __u16 tun_type;/* tunnel type */ __be16 tun_port;/* tunnel port */ +__u16 tun_flags;/* tunnel flags */ refcount_t refcnt;/* reference counter */ struct ip_vs_stats stats;/* statistics */
include/uapi/linux/ip_vs.h +7 -0
@@ -131,6 +131,11 @@ enum { IP_VS_CONN_F_TUNNEL_TYPE_MAX, }; +/* Tunnel encapsulation flags */ +#define IP_VS_TUNNEL_ENCAP_FLAG_NOCSUM (0) +#define IP_VS_TUNNEL_ENCAP_FLAG_CSUM (1 << 0) +#define IP_VS_TUNNEL_ENCAP_FLAG_REMCSUM (1 << 1) +/* * The struct ip_vs_service_user and struct ip_vs_dest_user are * used to set IPVS rules through setsockopt.
@@ -403,6 +408,8 @@ enum {IPVS_DEST_ATTR_TUN_PORT ,/* tunnel port */ +IPVS_DEST_ATTR_TUN_FLAGS ,/* tunnel flags */ + __IPVS_DEST_ATTR_MAX, };
net/netfilter/ipvs/ip_vs_ctl.c +10 -1
@@ -893,6 +893,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,/* set the tunnel info */ dest->tun_type = udest->tun_type; dest->tun_port = udest->tun_port; + dest->tun_flags = udest->tun_flags;/* set the IP_VS_CONN_F_NOOUTPUT flag if not masquerading/NAT */ if ((conn_flags &IP_VS_CONN_F_FWD_MASK ) !=IP_VS_CONN_F_MASQ ) {
@@ -2967,6 +2968,7 @@ static const struct nla_policy ip_vs_dest_policy[IPVS_DEST_ATTR_MAX + 1] = { [IPVS_DEST_ATTR_ADDR_FAMILY] = { .type = NLA_U16 }, [IPVS_DEST_ATTR_TUN_TYPE] = { .type = NLA_U8 }, [IPVS_DEST_ATTR_TUN_PORT] = { .type = NLA_U16 }, + [IPVS_DEST_ATTR_TUN_FLAGS] = { .type = NLA_U16 }, }; static int ip_vs_genl_fill_stats(struct sk_buff *skb, int container_type,
@@ -3273,6 +3275,8 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest) dest->tun_type) ||nla_put_be16 (skb,IPVS_DEST_ATTR_TUN_PORT , dest->tun_port) || +nla_put_u16 (skb,IPVS_DEST_ATTR_TUN_FLAGS , + dest->tun_flags) ||nla_put_u32 (skb,IPVS_DEST_ATTR_U_THRESH , dest->u_threshold) ||nla_put_u32 (skb,IPVS_DEST_ATTR_L_THRESH , dest->l_threshold) || nla_put_u32(skb, IPVS_DEST_ATTR_ACTIVE_CONNS,
@@ -3393,7 +3397,8 @@ static int ip_vs_genl_parse_dest(struct ip_vs_dest_user_kern *udest,/* If a full entry was requested, check for the additional fields */ if (full_entry) {struct nlattr *nla_fwd, *nla_weight, *nla_u_thresh, - *nla_l_thresh, *nla_tun_type, *nla_tun_port; + *nla_l_thresh, *nla_tun_type, *nla_tun_port, + *nla_tun_flags; nla_fwd = attrs[IPVS_DEST_ATTR_FWD_METHOD ]; nla_weight = attrs[IPVS_DEST_ATTR_WEIGHT ];
@@ -3401,6 +3406,7 @@ static int ip_vs_genl_parse_dest(struct ip_vs_dest_user_kern *udest, nla_l_thresh = attrs[IPVS_DEST_ATTR_L_THRESH ]; nla_tun_type = attrs[IPVS_DEST_ATTR_TUN_TYPE ]; nla_tun_port = attrs[IPVS_DEST_ATTR_TUN_PORT ]; + nla_tun_flags = attrs[IPVS_DEST_ATTR_TUN_FLAGS ];if (!(nla_fwd && nla_weight && nla_u_thresh && nla_l_thresh))return -EINVAL ;
@@ -3416,6 +3422,9 @@ static int ip_vs_genl_parse_dest(struct ip_vs_dest_user_kern *udest,if (nla_tun_port) udest->tun_port =nla_get_be16 (nla_tun_port); + +if (nla_tun_flags) + udest->tun_flags =nla_get_u16 (nla_tun_flags); }return 0 ;
net/netfilter/ipvs/ip_vs_xmit.c +127 -16
228 lines not on this page · raw message
Signature · 1 line
2.11.0
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Sat, 1 Jun 2019 20:23:25 +0200
Quoted 1 line
The following patchset container Netfilter/IPVS update for net-next:
Pulled, thanks Pablo.