netfilter: nf_ct_helper: better logging for dropped packets
Subsystems (2)
[email protected]
maintainerPATCH 1/1 netfilter: nf_ct_helper: better logging for dropped packets
From: Pablo Neira Ayuso <[email protected]>
Connection tracking helpers have to drop packets under exceptional situations. Currently, the user gets the following logging message in case that happens:
nf_ct_%s: dropping packet
However, depending on the helper, there are different reasons why a packet can be dropped.
This patch modifies the existing code to provide more specific error message in the scope of each helper to help users to debug the reason why the packet has been dropped.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/net/netfilter/nf_conntrack_helper.h | 17 +++++ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 10 +-- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 8 +-- net/netfilter/nf_conntrack_amanda.c | 7 +- net/netfilter/nf_conntrack_ftp.c | 12 ++-- net/netfilter/nf_conntrack_h323_main.c | 6 +- net/netfilter/nf_conntrack_irc.c | 9 ++- net/netfilter/nf_conntrack_sane.c | 5 +- net/netfilter/nf_conntrack_sip.c | 82 ++++++++++++++++++------ net/netfilter/nf_conntrack_tftp.c | 10 ++- net/netfilter/nf_nat_amanda.c | 8 ++- net/netfilter/nf_nat_ftp.c | 5 +- net/netfilter/nf_nat_irc.c | 8 ++- net/netfilter/nf_nat_sip.c | 57 ++++++++++++---- net/netfilter/nf_nat_tftp.c | 5 +- 15 files changed, 186 insertions(+), 63 deletions(-)
include/net/netfilter/nf_conntrack_helper.h +17 -0
@@ -12,6 +12,7 @@#include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_extend.h> #include <net/netfilter/nf_conntrack_expect.h> +#include <net/netfilter/nf_log.h> struct module ;
@@ -82,6 +83,22 @@ static inline void *nfct_help_data(const struct nf_conn *ct)return (void *)help->data; } +static inline void +nf_ct_helper_drop_log (struct sk_buff *skb,struct nf_conn *ct, +const char *fmt, ...) +{ +const struct nf_conn_help *help; +const struct nf_conntrack_helper *helper; + +/* Called from the helper function, we've got a helper for sure */ + help =nfct_help (ct); +/* rcu_read_lock()ed by nf_hook_slow */ + helper =rcu_dereference (help->helper); + +nf_log_packet (nf_ct_l3num (ct),0 , skb,NULL ,NULL ,NULL , +"nf_ct_%s: dropping packet: %s" , helper->name, fmt); +} +extern int nf_conntrack_helper_pernet_init (struct net *net);extern void nf_conntrack_helper_pernet_fini (struct net *net);
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +2 -8
@@ -100,7 +100,6 @@ static unsigned int ipv4_helper(unsigned int hooknum,enum ip_conntrack_info ctinfo;const struct nf_conn_help *help;const struct nf_conntrack_helper *helper; -unsigned int ret;/* This is where we call the helper: as the packet goes out. */ ct =nf_ct_get (skb, &ctinfo);
@@ -116,13 +115,8 @@ static unsigned int ipv4_helper(unsigned int hooknum,if (!helper)return NF_ACCEPT ; - ret = helper->help (skb,skb_network_offset (skb) +ip_hdrlen (skb), - ct, ctinfo); -if (ret !=NF_ACCEPT && (ret &NF_VERDICT_MASK ) !=NF_QUEUE ) { -nf_log_packet (NFPROTO_IPV4 , hooknum, skb, in, out,NULL , -"nf_ct_%s: dropping packet" , helper->name); - } -return ret; +return helper->help (skb,skb_network_offset (skb) +ip_hdrlen (skb), + ct, ctinfo); } static unsigned int ipv4_confirm(unsigned int hooknum,
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +1 -7
@@ -104,7 +104,6 @@ static unsigned int ipv6_helper(unsigned int hooknum,const struct nf_conn_help *help;const struct nf_conntrack_helper *helper;enum ip_conntrack_info ctinfo; -unsigned int ret;__be16 frag_off;int protoff;u8 nexthdr;
@@ -130,12 +129,7 @@ static unsigned int ipv6_helper(unsigned int hooknum,return NF_ACCEPT ; } - ret = helper->help (skb, protoff, ct, ctinfo); -if (ret !=NF_ACCEPT && (ret &NF_VERDICT_MASK ) !=NF_QUEUE ) { -nf_log_packet (NFPROTO_IPV6 , hooknum, skb, in, out,NULL , -"nf_ct_%s: dropping packet" , helper->name); - } -return ret; +return helper->help (skb, protoff, ct, ctinfo); } static unsigned int ipv6_confirm(unsigned int hooknum,
net/netfilter/nf_conntrack_amanda.c +6 -1
@@ -145,6 +145,8 @@ static int amanda_help(struct sk_buff *skb, exp =nf_ct_expect_alloc (ct);if (exp ==NULL ) { +nf_ct_helper_drop_log (skb, ct, +"cannot alloc expectation" ); ret =NF_DROP ; goto out; }
@@ -158,8 +160,11 @@ static int amanda_help(struct sk_buff *skb,if (nf_nat_amanda && ct->status &IPS_NAT_MASK ) ret =nf_nat_amanda (skb, ctinfo, protoff, off - dataoff, len, exp); -else if (nf_ct_expect_related (exp) !=0 ) +else if (nf_ct_expect_related (exp) !=0 ) { +nf_ct_helper_drop_log (skb, ct, +"cannot add expectation" ); ret =NF_DROP ; + }nf_ct_expect_put (exp); }
net/netfilter/nf_conntrack_ftp.c +8 -4
@@ -435,8 +435,9 @@ skip_nl_seq:connection tracking, not packet filtering. However, it is necessary for accurate tracking in this case. */ -pr_debug ("conntrack_ftp: partial %s %u+%u\n" , - search[dir][i].pattern,ntohl (th->seq), datalen); +nf_ct_helper_drop_log (skb, ct,"partial matching of " +"`%s' (%u+%u)" , search[dir][i].pattern, +ntohl (th->seq), datalen); ret =NF_DROP ; goto out; }else if (found ==0 ) {/* No match */
@@ -450,6 +451,7 @@ skip_nl_seq: exp =nf_ct_expect_alloc (ct);if (exp ==NULL ) { +nf_ct_helper_drop_log (skb, ct,"cannot allocate expectation" ); ret =NF_DROP ; goto out; }
@@ -500,9 +502,11 @@ skip_nl_seq: protoff, matchoff, matchlen, exp); else {/* Can't expect this? Best to drop packet now. */ -if (nf_ct_expect_related (exp) !=0 ) +if (nf_ct_expect_related (exp) !=0 ) { +nf_ct_helper_drop_log (skb, ct, +"cannot add expectation" ); ret =NF_DROP ; -else + }else ret =NF_ACCEPT ; }
net/netfilter/nf_conntrack_h323_main.c +3 -3
@@ -623,7 +623,7 @@ static int h245_help(struct sk_buff *skb, unsigned int protoff, drop:spin_unlock_bh (&nf_h323_lock); -net_info_ratelimited ("nf_ct_h245: packet dropped\n" ); +nf_ct_helper_drop_log (skb, ct,"failed to process H.245 message" );return NF_DROP ; }
@@ -1197,7 +1197,7 @@ static int q931_help(struct sk_buff *skb, unsigned int protoff, drop:spin_unlock_bh (&nf_h323_lock); -net_info_ratelimited ("nf_ct_q931: packet dropped\n" ); +nf_ct_helper_drop_log (skb, ct,"failed to process Q.931 message" );return NF_DROP ; }
@@ -1795,7 +1795,7 @@ static int ras_help(struct sk_buff *skb, unsigned int protoff, drop:spin_unlock_bh (&nf_h323_lock); -net_info_ratelimited ("nf_ct_ras: packet dropped\n" ); +nf_ct_helper_drop_log (skb, ct,"failed to process RAS message" );return NF_DROP ; }
net/netfilter/nf_conntrack_irc.c +8 -1
@@ -194,6 +194,9 @@ static int help(struct sk_buff *skb, unsigned int protoff, exp =nf_ct_expect_alloc (ct);if (exp ==NULL ) { +nf_ct_helper_drop_log (skb, ct, +"failed to allocate " +"expectation" ); ret =NF_DROP ; goto out; }
@@ -210,8 +213,12 @@ static int help(struct sk_buff *skb, unsigned int protoff, addr_beg_p - ib_ptr, addr_end_p - addr_beg_p, exp); - else if (nf_ct_expect_related(exp) != 0) + else if (nf_ct_expect_related(exp) != 0) { +nf_ct_helper_drop_log (skb, ct, +"failed to add " +"expectation" ); ret =NF_DROP ; + }nf_ct_expect_put (exp); goto out; }
net/netfilter/nf_conntrack_sane.c +4 -1
@@ -138,6 +138,7 @@ static int help(struct sk_buff *skb, exp =nf_ct_expect_alloc (ct);if (exp ==NULL ) { +nf_ct_helper_drop_log (skb, ct,"cannot alloc expectation" ); ret =NF_DROP ; goto out; }
@@ -151,8 +152,10 @@ static int help(struct sk_buff *skb,nf_ct_dump_tuple (&exp->tuple);/* Can't expect this? Best to drop packet now. */ -if (nf_ct_expect_related (exp) !=0 ) +if (nf_ct_expect_related (exp) !=0 ) { +nf_ct_helper_drop_log (skb, ct,"cannot add expectation" ); ret =NF_DROP ; + }nf_ct_expect_put (exp);
net/netfilter/nf_conntrack_sip.c +64 -18
185 lines not on this page · raw message
net/netfilter/nf_conntrack_tftp.c +8 -2
@@ -60,8 +60,11 @@ static int tftp_help(struct sk_buff *skb,nf_ct_dump_tuple (&ct->tuplehash[IP_CT_DIR_REPLY ].tuple); exp =nf_ct_expect_alloc (ct); -if (exp ==NULL ) +if (exp ==NULL ) { +nf_ct_helper_drop_log (skb, ct,"failed to allocate " +"expectation" );return NF_DROP ; + } tuple = &ct->tuplehash[IP_CT_DIR_REPLY ].tuple; nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_l3num(ct),
@@ -74,8 +77,11 @@ 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); -else if (nf_ct_expect_related (exp) !=0 ) +else if (nf_ct_expect_related (exp) !=0 ) { +nf_ct_helper_drop_log (skb, ct,"failed to add " +"expectation" ); ret =NF_DROP ; + }nf_ct_expect_put (exp);break ;case TFTP_OPCODE_DATA :
net/netfilter/nf_nat_amanda.c +6 -2
@@ -56,15 +56,19 @@ static unsigned int help(struct sk_buff *skb, } } -if (port ==0 ) +if (port ==0 ) { +nf_ct_helper_drop_log (skb, exp->master,"cannot mangle port" );return NF_DROP ; + }sprintf (buffer,"%u" , port); ret =nf_nat_mangle_udp_packet (skb, exp->master, ctinfo, protoff, matchoff, matchlen, buffer,strlen (buffer)); -if (ret !=NF_ACCEPT ) +if (ret !=NF_ACCEPT ) { +nf_ct_helper_drop_log (skb, exp->master,"cannot mangle packet" );nf_ct_unexpect_related (exp); + }return ret; }
net/netfilter/nf_nat_ftp.c +4 -1
@@ -96,8 +96,10 @@ static unsigned int nf_nat_ftp(struct sk_buff *skb, } } -if (port ==0 ) +if (port ==0 ) { +nf_ct_helper_drop_log (skb, ct,"cannot mangle port" );return NF_DROP ; + } buflen =nf_nat_ftp_fmt_cmd (ct, type, buffer,sizeof (buffer), &newaddr, port);
@@ -113,6 +115,7 @@ static unsigned int nf_nat_ftp(struct sk_buff *skb,return NF_ACCEPT ; out: +nf_ct_helper_drop_log (skb, ct,"cannot mangle command" );nf_ct_unexpect_related (exp);return NF_DROP ; }
net/netfilter/nf_nat_irc.c +6 -2
@@ -56,14 +56,18 @@ static unsigned int help(struct sk_buff *skb, } } -if (port ==0 ) +if (port ==0 ) { +nf_ct_helper_drop_log (skb, exp->master,"cannot mangle port" );return NF_DROP ; + } ret =nf_nat_mangle_tcp_packet (skb, exp->master, ctinfo, protoff, matchoff, matchlen, buffer,strlen (buffer)); -if (ret !=NF_ACCEPT ) +if (ret !=NF_ACCEPT ) { +nf_ct_helper_drop_log (skb, exp->master,"cannot mangle packet" );nf_ct_unexpect_related (exp); + }return ret; }
net/netfilter/nf_nat_sip.c +45 -12
139 lines not on this page · raw message
net/netfilter/nf_nat_tftp.c +4 -1
@@ -28,8 +28,11 @@ static unsigned int help(struct sk_buff *skb, = 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 ) +if (nf_ct_expect_related (exp) !=0 ) { +nf_ct_helper_drop_log (skb, exp->master, +"cannot add expectation" );return NF_DROP ; + }return NF_ACCEPT ; }
Signature · 1 line
1.7.10.4