netfilter: conntrack_helper: pass master conntrack to helper functions
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/2 netfilter: conntrack_helper: pass master conntrack to helper functions
Pass master conntrack as argument to helper functions that parse the packet payload, instead of using exp->master. Although accessing exp->master is safe in this case because it refers to the master conntrack in used by this skb, remove it to step towards turning the exp->master field into a cookie value.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/linux/netfilter/nf_conntrack_amanda.h | 1 + include/linux/netfilter/nf_conntrack_ftp.h | 1 + include/linux/netfilter/nf_conntrack_irc.h | 1 + include/linux/netfilter/nf_conntrack_tftp.h | 1 + net/netfilter/nf_conntrack_amanda.c | 2 +- net/netfilter/nf_conntrack_ftp.c | 2 +- net/netfilter/nf_conntrack_irc.c | 2 +- net/netfilter/nf_conntrack_tftp.c | 2 +- net/netfilter/nf_nat_amanda.c | 7 ++++--- net/netfilter/nf_nat_ftp.c | 4 ++-- net/netfilter/nf_nat_irc.c | 2 +- net/netfilter/nf_nat_tftp.c | 5 ++--- 12 files changed, 17 insertions(+), 13 deletions(-)
include/linux/netfilter/nf_conntrack_amanda.h +1 -0
@@ -9,6 +9,7 @@typedef unsigned int nf_nat_amanda_hook_fn(struct sk_buff *skb, + struct nf_conn *ct, enum ip_conntrack_info ctinfo, unsigned int protoff, unsigned int matchoff,
include/linux/netfilter/nf_conntrack_ftp.h +1 -0
@@ -28,6 +28,7 @@ struct nf_ct_ftp_master {* connection we should expect. */ typedef unsigned int nf_nat_ftp_hook_fn(struct sk_buff *skb, + struct nf_conn *ct, enum ip_conntrack_info ctinfo, enum nf_ct_ftp_type type, unsigned int protoff,
include/linux/netfilter/nf_conntrack_irc.h +1 -0
@@ -10,6 +10,7 @@typedef unsigned int nf_nat_irc_hook_fn(struct sk_buff *skb, + struct nf_conn *ct, enum ip_conntrack_info ctinfo, unsigned int protoff, unsigned int matchoff,
include/linux/netfilter/nf_conntrack_tftp.h +1 -0
@@ -19,6 +19,7 @@ struct tftphdr {typedef unsigned int nf_nat_tftp_hook_fn (struct sk_buff *skb, +struct nf_conn *ct,enum ip_conntrack_info ctinfo,struct nf_conntrack_expect *exp);
net/netfilter/nf_conntrack_amanda.c +1 -1
@@ -151,7 +151,7 @@ static int amanda_help(struct sk_buff *skb, nf_nat_amanda =rcu_dereference (nf_nat_amanda_hook);if (nf_nat_amanda && ct->status &IPS_NAT_MASK ) - ret =nf_nat_amanda (skb, ctinfo, protoff, + ret =nf_nat_amanda (skb, ct, ctinfo, protoff, off - dataoff, len, exp);else if (nf_ct_expect_related (exp,0 ) !=0 ) {nf_ct_helper_log (skb, ct,"cannot add expectation" );
net/netfilter/nf_conntrack_ftp.c +1 -1
@@ -515,7 +515,7 @@ static int help(struct sk_buff *skb,* (possibly changed) expectation itself. */ nf_nat_ftp =rcu_dereference (nf_nat_ftp_hook);if (nf_nat_ftp && ct->status &IPS_NAT_MASK ) - ret =nf_nat_ftp (skb, ctinfo, search[dir][i].ftptype, + ret =nf_nat_ftp (skb, ct, ctinfo, search[dir][i].ftptype, protoff, matchoff, matchlen, exp);else {/* Can't expect this? Best to drop packet now. */
net/netfilter/nf_conntrack_irc.c +1 -1
@@ -231,7 +231,7 @@ static int help(struct sk_buff *skb, unsigned int protoff, nf_nat_irc =rcu_dereference (nf_nat_irc_hook);if (nf_nat_irc && ct->status &IPS_NAT_MASK ) - ret =nf_nat_irc (skb, ctinfo, protoff, + ret =nf_nat_irc (skb, ct, ctinfo, protoff, addr_beg_p - ib_ptr, addr_end_p - addr_beg_p, exp);
net/netfilter/nf_conntrack_tftp.c +1 -1
@@ -69,7 +69,7 @@ static int tftp_help(struct sk_buff *skb, nf_nat_tftp =rcu_dereference (nf_nat_tftp_hook);if (nf_nat_tftp && ct->status &IPS_NAT_MASK ) - ret =nf_nat_tftp (skb, ctinfo, exp); + ret =nf_nat_tftp (skb, ct, ctinfo, exp);else if (nf_ct_expect_related (exp,0 ) !=0 ) {nf_ct_helper_log (skb, ct,"cannot add expectation" ); ret =NF_DROP ;
net/netfilter/nf_nat_amanda.c +4 -3
@@ -26,6 +26,7 @@ static struct nf_conntrack_nat_helper nat_helper_amanda =NF_CT_NAT_HELPER_INIT (NAT_HELPER_NAME ); static unsigned int help(struct sk_buff *skb, + struct nf_conn *ct, enum ip_conntrack_info ctinfo, unsigned int protoff, unsigned int matchoff,
@@ -46,15 +47,15 @@ static unsigned int help(struct sk_buff *skb,/* Try to get same port: if not, try to change it. */ port =nf_nat_exp_find_port (exp,ntohs (exp->saved_proto.tcp.port));if (port ==0 ) { -nf_ct_helper_log (skb, exp->master,"all ports in use" ); +nf_ct_helper_log (skb, ct,"all ports in use" );return NF_DROP ; }snprintf (buffer,sizeof (buffer),"%u" , port); -if (!nf_nat_mangle_udp_packet (skb, exp->master, ctinfo, +if (!nf_nat_mangle_udp_packet (skb, ct, ctinfo, protoff, matchoff, matchlen, buffer,strlen (buffer))) { -nf_ct_helper_log (skb, exp->master,"cannot mangle packet" ); +nf_ct_helper_log (skb, ct,"cannot mangle packet" );nf_ct_unexpect_related (exp);return NF_DROP ; }
net/netfilter/nf_nat_ftp.c +2 -2
@@ -61,6 +61,7 @@ static int nf_nat_ftp_fmt_cmd(struct nf_conn *ct, enum nf_ct_ftp_type type,/* So, this packet has hit the connection tracking matching code. Mangle it, and change the expectation to match the new version. */ static unsigned int nf_nat_ftp(struct sk_buff *skb, + struct nf_conn *ct, enum ip_conntrack_info ctinfo, enum nf_ct_ftp_type type, unsigned int protoff,
@@ -71,7 +72,6 @@ static unsigned int nf_nat_ftp(struct sk_buff *skb,union nf_inet_addr newaddr;u_int16_t port;int dir =CTINFO2DIR (ctinfo); -struct nf_conn *ct = exp->master;char buffer[sizeof ("|1||65535|" ) +INET6_ADDRSTRLEN ];unsigned int buflen;
@@ -88,7 +88,7 @@ static unsigned int nf_nat_ftp(struct sk_buff *skb, port =nf_nat_exp_find_port (exp,ntohs (exp->saved_proto.tcp.port));if (port ==0 ) { -nf_ct_helper_log (skb, exp->master,"all ports in use" ); +nf_ct_helper_log (skb, ct,"all ports in use" );return NF_DROP ; }
net/netfilter/nf_nat_irc.c +1 -1
@@ -30,6 +30,7 @@ static struct nf_conntrack_nat_helper nat_helper_irc =NF_CT_NAT_HELPER_INIT (NAT_HELPER_NAME ); static unsigned int help(struct sk_buff *skb, + struct nf_conn *ct, enum ip_conntrack_info ctinfo, unsigned int protoff, unsigned int matchoff,
@@ -37,7 +38,6 @@ static unsigned int help(struct sk_buff *skb, struct nf_conntrack_expect *exp) {char buffer[sizeof ("4294967296 65635" )]; -struct nf_conn *ct = exp->master;union nf_inet_addr newaddr;u_int16_t port;
net/netfilter/nf_nat_tftp.c +2 -3
@@ -21,17 +21,16 @@ static struct nf_conntrack_nat_helper nat_helper_tftp =NF_CT_NAT_HELPER_INIT (NAT_HELPER_NAME );static unsigned int help (struct sk_buff *skb, +struct nf_conn *ct,enum ip_conntrack_info ctinfo,struct nf_conntrack_expect *exp) { -const struct nf_conn *ct = exp->master; - exp->saved_proto.udp.port = ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple.src.u.udp.port; exp->dir =IP_CT_DIR_REPLY ; exp->expectfn = nf_nat_follow_master;if (nf_ct_expect_related (exp,0 ) !=0 ) { -nf_ct_helper_log (skb, exp->master,"cannot add expectation" ); +nf_ct_helper_log (skb, ct,"cannot add expectation" );return NF_DROP ; }return NF_ACCEPT ;
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 2/2 netfilter: nf_conntrack_expect: store event cache in expectation
Store the event cache in the expectation instead of accessing the exp->master cache, as a step forward towards turning the exp->master into a cookie.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/net/netfilter/nf_conntrack_expect.h | 3 +++ net/netfilter/nf_conntrack_broadcast.c | 6 ++++++ net/netfilter/nf_conntrack_ecache.c | 7 +------ net/netfilter/nf_conntrack_expect.c | 5 +++++ net/netfilter/nf_conntrack_netlink.c | 5 +++++ 5 files changed, 20 insertions(+), 6 deletions(-)
include/net/netfilter/nf_conntrack_expect.h +3 -0
@@ -42,6 +42,9 @@ struct nf_conntrack_expect {/* Expectation class */ unsigned int class; +/* Event filter mask */ +u16 event_mask; +/* Function to call after setup and insertion */ void (*expectfn)(struct nf_conn *new,struct nf_conntrack_expect *this);
net/netfilter/nf_conntrack_broadcast.c +6 -0
@@ -14,6 +14,7 @@#include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_conntrack_expect.h> +#include <net/netfilter/nf_conntrack_ecache.h> int nf_conntrack_broadcast_help(struct sk_buff *skb, struct nf_conn *ct,
@@ -27,6 +28,7 @@ int nf_conntrack_broadcast_help(struct sk_buff *skb,struct rtable *rt =skb_rtable (skb);struct in_device *in_dev;struct nf_conn_help *help =nfct_help (ct); +struct nf_conntrack_ecache *ecache;__be32 mask =0 ;if (!help)
@@ -79,6 +81,10 @@ int nf_conntrack_broadcast_help(struct sk_buff *skb,#ifdef CONFIG_NF_CONNTRACK_ZONES exp->zone = ct->zone;#endif + ecache =nf_ct_ecache_find (ct); +if (ecache) + exp->event_mask = ecache->expmask; +nf_ct_expect_related (exp,0 );nf_ct_expect_put (exp);
net/netfilter/nf_conntrack_ecache.c +1 -6
@@ -245,7 +245,6 @@ void nf_ct_expect_event_report(enum ip_conntrack_expect_events event, {struct net *net =nf_ct_exp_net (exp);struct nf_ct_event_notifier *notify; -struct nf_conntrack_ecache *e;lockdep_nfct_expect_lock_held ();
@@ -254,11 +253,7 @@ void nf_ct_expect_event_report(enum ip_conntrack_expect_events event,if (!notify) goto out_unlock; - e =nf_ct_ecache_find (exp->master); -if (!e) - goto out_unlock; - -if (e->expmask & (1 << event)) { +if (exp->event_mask & (1 << event)) {struct nf_exp_event item = { .exp = exp, .portid = portid,
net/netfilter/nf_conntrack_expect.c +5 -0
@@ -330,6 +330,7 @@ void nf_ct_expect_init(struct nf_conntrack_expect *exp, unsigned int class,struct nf_conntrack_helper *helper =NULL ;struct nf_conn *ct = exp->master;struct net *net =read_pnet (&ct->ct_net); +struct nf_conntrack_ecache *ecache;struct nf_conn_help *help;int len;
@@ -342,6 +343,10 @@ void nf_ct_expect_init(struct nf_conntrack_expect *exp, unsigned int class, exp->class = class; exp->expectfn =NULL ; + ecache =nf_ct_ecache_find (ct); +if (ecache) + exp->event_mask = ecache->expmask; + help =nfct_help (ct);if (help) helper =rcu_dereference (help->helper);
net/netfilter/nf_conntrack_netlink.c +5 -0
@@ -3524,6 +3524,7 @@ ctnetlink_alloc_expect(const struct nlattr * const cda[], struct nf_conn *ct, {struct net *net =read_pnet (&ct->ct_net);struct nf_conntrack_helper *helper; +struct nf_conntrack_ecache *ecache;struct nf_conntrack_expect *exp;struct nf_conn_help *help;u32 class =0 ;
@@ -3575,6 +3576,10 @@ ctnetlink_alloc_expect(const struct nlattr * const cda[], struct nf_conn *ct, exp->mask.src.u3 = mask->src.u3; exp->mask.src.u.all = mask->src.u.all; + ecache =nf_ct_ecache_find (ct); +if (ecache) + exp->event_mask = ecache->expmask; +if (cda[CTA_EXPECT_NAT ]) { err =ctnetlink_parse_expect_nat (cda[CTA_EXPECT_NAT ], exp,nf_ct_l3num (ct));
Signature · 1 line
2.47.3