netfilter updates for net-next
Subsystems (3)
[email protected]
maintainercover netfilter updates for net-next
From: Pablo Neira Ayuso <[email protected]>
Hi David,
The following patchset contain updates for your net-next tree, they are:
* Fix (for just added) connlabel dependencies, from Florian Westphal.
* Add aliasing support for conntrack, thus users can either use -m state or -m conntrack from iptables while using the same kernel module, from Jozsef Kadlecsik.
* Some code refactoring for the CT target to merge common code in revision 0 and 1, from myself.
* Add aliasing support for CT, based on patch from Jozsef Kadlecsik.
* Add one mutex per nfnetlink subsystem, from myself.
* Improved logging for packets that are dropped by helpers, from myself.
You can pull these changes from:
git://1984.lsi.us.es/nf-next master
Thanks!
Florian Westphal (1):
netfilter: fix missing dependencies for NETFILTER_XT_MATCH_CONNLABEL
Jozsef Kadlecsik (1):
netfilter: xt_conntrack: Add flag to support aliases
Pablo Neira Ayuso (4):
netfilter: xt_CT: merge common code of revision 0 and 1
netfilter: xt_CT: add alias flag
netfilter: nfnetlink: add mutex per subsystem
netfilter: nf_ct_helper: better logging for dropped packets
Reese Moore (1):
netfilter: nf_ct_pptp: Fix comment referring to incorrect RFC
include/linux/netfilter/nfnetlink.h | 4 +- include/net/netfilter/nf_conntrack_helper.h | 3 + include/uapi/linux/netfilter/xt_CT.h | 6 +- include/uapi/linux/netfilter/xt_conntrack.h | 1 + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 10 +- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 8 +- net/netfilter/Kconfig | 1 + net/netfilter/ipset/ip_set_core.c | 26 ++-- net/netfilter/nf_conntrack_amanda.c | 5 +- net/netfilter/nf_conntrack_ftp.c | 10 +- net/netfilter/nf_conntrack_h323_main.c | 6 +- net/netfilter/nf_conntrack_helper.c | 18 +++ net/netfilter/nf_conntrack_irc.c | 7 +- net/netfilter/nf_conntrack_netlink.c | 12 +- net/netfilter/nf_conntrack_pptp.c | 2 +- net/netfilter/nf_conntrack_sane.c | 5 +- net/netfilter/nf_conntrack_sip.c | 80 ++++++++--- net/netfilter/nf_conntrack_tftp.c | 8 +- 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 | 49 +++++-- net/netfilter/nf_nat_tftp.c | 4 +- net/netfilter/nfnetlink.c | 52 ++++--- net/netfilter/xt_CT.c | 177 ++++++++++++------------ 25 files changed, 315 insertions(+), 200 deletions(-)
Signature · 1 line
1.7.10.4
[email protected]
maintainerPATCH 1/7 netfilter: fix missing dependencies for NETFILTER_XT_MATCH_CONNLABEL
From: Florian Westphal <[email protected]>
It was possible to set NF_CONNTRACK=n and NF_CONNTRACK_LABELS=y via NETFILTER_XT_MATCH_CONNLABEL=y.
warning: (NETFILTER_XT_MATCH_CONNLABEL) selects NF_CONNTRACK_LABELS which has unmet direct dependencies (NET && INET && NETFILTER && NF_CONNTRACK)
--- net/netfilter/Kconfig | 1 + 1 file changed, 1 insertion(+)
net/netfilter/Kconfig +1 -0
@@ -860,6 +860,7 @@ config NETFILTER_XT_MATCH_CONNBYTES config NETFILTER_XT_MATCH_CONNLABEL tristate '"connlabel" match support' select NF_CONNTRACK_LABELS + depends on NF_CONNTRACK depends on NETFILTER_ADVANCED ---help--- This match allows you to test and assign userspace-defined labels names
Signature · 1 line
1.7.10.4
[email protected]
maintainerPATCH 2/7 netfilter: xt_conntrack: Add flag to support aliases
In reply to [email protected]From: Jozsef Kadlecsik <[email protected]>
The patch adds the flag to denote the "state" alias as of the subset of the "conntrack" match.
--- include/uapi/linux/netfilter/xt_conntrack.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/netfilter/xt_conntrack.h +1 -0
@@ -31,6 +31,7 @@ enum {XT_CONNTRACK_REPLSRC_PORT =1 <<10 ,XT_CONNTRACK_REPLDST_PORT =1 <<11 ,XT_CONNTRACK_DIRECTION =1 <<12 , + XT_CONNTRACK_STATE_ALIAS = 1 << 13, }; struct xt_conntrack_mtinfo1 {
Signature · 1 line
1.7.10.4
[email protected]
maintainerPATCH 3/7 netfilter: xt_CT: merge common code of revision 0 and 1
In reply to [email protected]From: Pablo Neira Ayuso <[email protected]>
This patch merges the common code for revision 0 and 1.
--- net/netfilter/xt_CT.c | 145 +++++++++++++++++++------------------------------ 1 file changed, 56 insertions(+), 89 deletions(-)
net/netfilter/xt_CT.c +56 -89
@@ -20,12 +20,8 @@#include <net/netfilter/nf_conntrack_timeout.h> #include <net/netfilter/nf_conntrack_zones.h> -static unsigned int xt_ct_target_v0 (struct sk_buff *skb, -const struct xt_action_param *par) +static inline int xt_ct_target (struct sk_buff *skb,struct nf_conn *ct) { -const struct xt_ct_target_info *info = par->targinfo; -struct nf_conn *ct = info->ct; -/* Previously seen (loopback)? Ignore. */ if (skb->nfct !=NULL )return XT_CONTINUE ;
@@ -37,21 +33,22 @@ static unsigned int xt_ct_target_v0(struct sk_buff *skb,return XT_CONTINUE ; } -static unsigned int xt_ct_target_v1 (struct sk_buff *skb, +static unsigned int xt_ct_target_v0 (struct sk_buff *skb,const struct xt_action_param *par) { -const struct xt_ct_target_info_v1 *info = par->targinfo; +const struct xt_ct_target_info *info = par->targinfo;struct nf_conn *ct = info->ct; -/* Previously seen (loopback)? Ignore. */ -if (skb->nfct !=NULL ) -return XT_CONTINUE ; +return xt_ct_target (skb, ct); +} -atomic_inc (&ct->ct_general.use); - skb->nfct = &ct->ct_general; - skb->nfctinfo =IP_CT_NEW ; +static unsigned int xt_ct_target_v1 (struct sk_buff *skb, +const struct xt_action_param *par) +{ +const struct xt_ct_target_info_v1 *info = par->targinfo; +struct nf_conn *ct = info->ct; -return XT_CONTINUE ; +return xt_ct_target (skb, ct); }static u8 xt_ct_find_proto (const struct xt_tgchk_param *par)
@@ -104,67 +101,6 @@ xt_ct_set_helper(struct nf_conn *ct, const char *helper_name,return 0 ; } -static int xt_ct_tg_check_v0 (const struct xt_tgchk_param *par) -{ -struct xt_ct_target_info *info = par->targinfo; -struct nf_conntrack_tuple t; -struct nf_conn *ct; -int ret = -EOPNOTSUPP ; - -if (info->flags & ~XT_CT_NOTRACK ) -return -EINVAL ; - -if (info->flags &XT_CT_NOTRACK ) { - ct =nf_ct_untracked_get (); -atomic_inc (&ct->ct_general.use); - goto out; - } - -#ifndef CONFIG_NF_CONNTRACK_ZONES -if (info->zone) - goto err1; -#endif - - ret =nf_ct_l3proto_try_module_get (par->family); -if (ret <0 ) - goto err1; - -memset (&t,0 ,sizeof (t)); - ct =nf_conntrack_alloc (par->net, info->zone, &t, &t,GFP_KERNEL ); - ret =PTR_ERR (ct); -if (IS_ERR (ct)) - goto err2; - - ret =0 ; -if ((info->ct_events || info->exp_events) && - !nf_ct_ecache_ext_add (ct, info->ct_events, info->exp_events, -GFP_KERNEL )) - goto err3; - -if (info->helper[0 ]) { - ret =xt_ct_set_helper (ct, info->helper, par); -if (ret <0 ) - goto err3; - } - -__set_bit (IPS_TEMPLATE_BIT , &ct->status); -__set_bit (IPS_CONFIRMED_BIT , &ct->status); - -/* Overload tuple linked list to put us in template list. */ -hlist_nulls_add_head_rcu (&ct->tuplehash[IP_CT_DIR_ORIGINAL ].hnnode, - &par->net->ct.tmpl); -out: - info->ct = ct; -return 0 ; - -err3: -nf_conntrack_free (ct); -err2: -nf_ct_l3proto_module_put (par->family); -err1: -return ret; -} -#ifdef CONFIG_NF_CONNTRACK_TIMEOUT static void __xt_ct_tg_timeout_put (struct ctnl_timeout *timeout) {
@@ -242,9 +178,9 @@ out:#endif } -static int xt_ct_tg_check_v1 (const struct xt_tgchk_param *par) +static int xt_ct_tg_check (const struct xt_tgchk_param *par, +struct xt_ct_target_info_v1 *info) { -struct xt_ct_target_info_v1 *info = par->targinfo;struct nf_conntrack_tuple t;struct nf_conn *ct;int ret = -EOPNOTSUPP ;
@@ -309,20 +245,31 @@ err1:return ret; } -static void xt_ct_tg_destroy_v0 (const struct xt_tgdtor_param *par) +static int xt_ct_tg_check_v0 (const struct xt_tgchk_param *par) {struct xt_ct_target_info *info = par->targinfo; -struct nf_conn *ct = info->ct; -struct nf_conn_help *help; +struct xt_ct_target_info_v1 info_v1 = { + .flags = info->flags, + .zone = info->zone, + .ct_events = info->ct_events, + .exp_events = info->exp_events, + }; +int ret; -if (!nf_ct_is_untracked (ct)) { - help =nfct_help (ct); -if (help) -module_put (help->helper->me); +memcpy (info_v1.helper, info->helper,sizeof (info->helper)); -nf_ct_l3proto_module_put (par->family); - } -nf_ct_put (info->ct); + ret =xt_ct_tg_check (par, &info_v1); +if (ret <0 ) +return ret; + + info->ct = info_v1.ct; + +return ret; +} + +static int xt_ct_tg_check_v1 (const struct xt_tgchk_param *par) +{ +return xt_ct_tg_check (par, par->targinfo); }static void xt_ct_destroy_timeout (struct nf_conn *ct)
@@ -343,9 +290,9 @@ static void xt_ct_destroy_timeout(struct nf_conn *ct)#endif } -static void xt_ct_tg_destroy_v1 (const struct xt_tgdtor_param *par) +static void xt_ct_tg_destroy (const struct xt_tgdtor_param *par, +struct xt_ct_target_info_v1 *info) { -struct xt_ct_target_info_v1 *info = par->targinfo;struct nf_conn *ct = info->ct;struct nf_conn_help *help;
@@ -361,6 +308,26 @@ static void xt_ct_tg_destroy_v1(const struct xt_tgdtor_param *par)nf_ct_put (info->ct); } +static void xt_ct_tg_destroy_v0 (const struct xt_tgdtor_param *par) +{ +struct xt_ct_target_info *info = par->targinfo; +struct xt_ct_target_info_v1 info_v1 = { + .flags = info->flags, + .zone = info->zone, + .ct_events = info->ct_events, + .exp_events = info->exp_events, + .ct = info->ct, + }; +memcpy (info_v1.helper, info->helper,sizeof (info->helper)); + +xt_ct_tg_destroy (par, &info_v1); +} + +static void xt_ct_tg_destroy_v1 (const struct xt_tgdtor_param *par) +{ +xt_ct_tg_destroy (par, par->targinfo); +} +static struct xt_target xt_ct_tg_reg[]__read_mostly = { { .name ="CT" ,
Signature · 1 line
1.7.10.4
[email protected]
maintainerPATCH 4/7 netfilter: xt_CT: add alias flag
In reply to [email protected]From: Pablo Neira Ayuso <[email protected]>
This patch adds the alias flag to support full NOTRACK target aliasing.
Based on initial patch from Jozsef Kadlecsik.
--- include/uapi/linux/netfilter/xt_CT.h | 6 +++++- net/netfilter/xt_CT.c | 32 +++++++++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 4 deletions(-)
include/uapi/linux/netfilter/xt_CT.h +5 -1
@@ -3,7 +3,11 @@#include <linux/types.h> -#define XT_CT_NOTRACK 0x1 +enum { +XT_CT_NOTRACK =1 <<0 , +XT_CT_NOTRACK_ALIAS =1 <<1 , +XT_CT_MASK =XT_CT_NOTRACK |XT_CT_NOTRACK_ALIAS , +};struct xt_ct_target_info {__u16 flags;
net/netfilter/xt_CT.c +29 -3
@@ -185,9 +185,6 @@ static int xt_ct_tg_check(const struct xt_tgchk_param *par,struct nf_conn *ct;int ret = -EOPNOTSUPP ; -if (info->flags & ~XT_CT_NOTRACK ) -return -EINVAL ; -if (info->flags &XT_CT_NOTRACK ) { ct =nf_ct_untracked_get ();atomic_inc (&ct->ct_general.use);
@@ -256,6 +253,9 @@ static int xt_ct_tg_check_v0(const struct xt_tgchk_param *par) };int ret; +if (info->flags & ~XT_CT_NOTRACK ) +return -EINVAL ; +memcpy (info_v1.helper, info->helper,sizeof (info->helper)); ret =xt_ct_tg_check (par, &info_v1);
@@ -269,6 +269,21 @@ static int xt_ct_tg_check_v0(const struct xt_tgchk_param *par)static int xt_ct_tg_check_v1 (const struct xt_tgchk_param *par) { +struct xt_ct_target_info_v1 *info = par->targinfo; + +if (info->flags & ~XT_CT_NOTRACK ) +return -EINVAL ; + +return xt_ct_tg_check (par, par->targinfo); +} + +static int xt_ct_tg_check_v2 (const struct xt_tgchk_param *par) +{ +struct xt_ct_target_info_v1 *info = par->targinfo; + +if (info->flags & ~XT_CT_MASK ) +return -EINVAL ; +return xt_ct_tg_check (par, par->targinfo); }
@@ -350,6 +365,17 @@ static struct xt_target xt_ct_tg_reg[] __read_mostly = { .table = "raw", .me = THIS_MODULE, }, + { + .name = "CT", + .family = NFPROTO_UNSPEC, + .revision = 2, + .targetsize = sizeof(struct xt_ct_target_info_v1), + .checkentry = xt_ct_tg_check_v2, + .destroy = xt_ct_tg_destroy_v1, + .target = xt_ct_target_v1, + .table = "raw", + .me = THIS_MODULE, + }, }; static unsigned int
Signature · 1 line
1.7.10.4
[email protected]
maintainerPATCH 5/7 netfilter: nfnetlink: add mutex per subsystem
In reply to [email protected]From: Pablo Neira Ayuso <[email protected]>
This patch replaces the global lock to one lock per subsystem. The per-subsystem lock avoids that processes operating with different subsystems are synchronized.
--- include/linux/netfilter/nfnetlink.h | 4 +-- net/netfilter/ipset/ip_set_core.c | 26 ++++++++--------- net/netfilter/nf_conntrack_netlink.c | 12 ++++---- net/netfilter/nfnetlink.c | 52 +++++++++++++++++++++------------- 4 files changed, 53 insertions(+), 41 deletions(-)
include/linux/netfilter/nfnetlink.h +2 -2
@@ -34,8 +34,8 @@ extern int nfnetlink_send(struct sk_buff *skb, struct net *net, u32 pid, unsigneextern int nfnetlink_set_err (struct net *net,u32 pid,u32 group,int error);extern int nfnetlink_unicast (struct sk_buff *skb,struct net *net,u_int32_t pid,int flags); -extern void nfnl_lock (void ); -extern void nfnl_unlock (void ); +extern void nfnl_lock (__u8 subsys_id); +extern void nfnl_unlock (__u8 subsys_id);#define MODULE_ALIAS_NFNL_SUBSYS (subsys) \ MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys))
net/netfilter/ipset/ip_set_core.c +13 -13
@@ -88,14 +88,14 @@ find_set_type(const char *name, u8 family, u8 revision)static bool load_settype (const char *name) { -nfnl_unlock (); +nfnl_unlock (NFNL_SUBSYS_IPSET );pr_debug ("try to load ip_set_%s\n" , name);if (request_module ("ip_set_%s" , name) <0 ) {pr_warning ("Can't find ip_set type %s\n" , name); -nfnl_lock (); +nfnl_lock (NFNL_SUBSYS_IPSET );return false; } -nfnl_lock (); +nfnl_lock (NFNL_SUBSYS_IPSET );return true; }
@@ -532,7 +532,7 @@ ip_set_nfnl_get(const char *name)ip_set_id_t i, index =IPSET_INVALID_ID ;struct ip_set *s; -nfnl_lock (); +nfnl_lock (NFNL_SUBSYS_IPSET );for (i =0 ; i < ip_set_max; i++) { s =nfnl_set (i);if (s !=NULL &&STREQ (s->name, name)) {
@@ -541,7 +541,7 @@ ip_set_nfnl_get(const char *name)break ; } } -nfnl_unlock (); +nfnl_unlock (NFNL_SUBSYS_IPSET );return index; }
@@ -561,13 +561,13 @@ ip_set_nfnl_get_byindex(ip_set_id_t index)if (index > ip_set_max)return IPSET_INVALID_ID ; -nfnl_lock (); +nfnl_lock (NFNL_SUBSYS_IPSET ); set =nfnl_set (index);if (set)__ip_set_get (set);else index =IPSET_INVALID_ID ; -nfnl_unlock (); +nfnl_unlock (NFNL_SUBSYS_IPSET );return index; }
@@ -584,11 +584,11 @@ void ip_set_nfnl_put(ip_set_id_t index) {struct ip_set *set; -nfnl_lock (); +nfnl_lock (NFNL_SUBSYS_IPSET ); set =nfnl_set (index);if (set !=NULL )__ip_set_put (set); -nfnl_unlock (); +nfnl_unlock (NFNL_SUBSYS_IPSET ); }EXPORT_SYMBOL_GPL (ip_set_nfnl_put);
@@ -1763,10 +1763,10 @@ ip_set_sockfn_get(struct sock *sk, int optval, void __user *user, int *len) goto done; } req_get->set.name[IPSET_MAXNAMELEN -1 ] ='\0' ; -nfnl_lock (); +nfnl_lock (NFNL_SUBSYS_IPSET );find_set_and_id (req_get->set.name, &id); req_get->set.index = id; -nfnl_unlock (); +nfnl_unlock (NFNL_SUBSYS_IPSET ); goto copy; }case IP_SET_OP_GET_BYINDEX : {
@@ -1778,11 +1778,11 @@ ip_set_sockfn_get(struct sock *sk, int optval, void __user *user, int *len) ret = -EINVAL ; goto done; } -nfnl_lock (); +nfnl_lock (NFNL_SUBSYS_IPSET ); set =nfnl_set (req_get->set.index);strncpy (req_get->set.name, set ? set->name :"" ,IPSET_MAXNAMELEN ); -nfnl_unlock (); +nfnl_unlock (NFNL_SUBSYS_IPSET ); goto copy; }default :
net/netfilter/nf_conntrack_netlink.c +6 -6
@@ -1256,13 +1256,13 @@ ctnetlink_parse_nat_setup(struct nf_conn *ct,if (!parse_nat_setup) {#ifdef CONFIG_MODULES rcu_read_unlock (); -nfnl_unlock (); +nfnl_unlock (NFNL_SUBSYS_CTNETLINK );if (request_module ("nf-nat" ) <0 ) { -nfnl_lock (); +nfnl_lock (NFNL_SUBSYS_CTNETLINK );rcu_read_lock ();return -EOPNOTSUPP ; } -nfnl_lock (); +nfnl_lock (NFNL_SUBSYS_CTNETLINK );rcu_read_lock ();if (nfnetlink_parse_nat_setup_hook)return -EAGAIN ;
@@ -1274,13 +1274,13 @@ ctnetlink_parse_nat_setup(struct nf_conn *ct,if (err == -EAGAIN ) {#ifdef CONFIG_MODULES rcu_read_unlock (); -nfnl_unlock (); +nfnl_unlock (NFNL_SUBSYS_CTNETLINK );if (request_module ("nf-nat-%u" ,nf_ct_l3num (ct)) <0 ) { -nfnl_lock (); +nfnl_lock (NFNL_SUBSYS_CTNETLINK );rcu_read_lock ();return -EOPNOTSUPP ; } -nfnl_lock (); +nfnl_lock (NFNL_SUBSYS_CTNETLINK );rcu_read_lock ();#else err = -EOPNOTSUPP ;
net/netfilter/nfnetlink.c +32 -20
112 lines not on this page · raw message
Signature · 1 line
1.7.10.4
[email protected]
maintainerPATCH 6/7 netfilter: nf_ct_pptp: Fix comment referring to incorrect RFC
In reply to [email protected]From: Reese Moore <[email protected]>
The header of this file cites to "RFFC2673" which is "Binary Labels in the Domain Name System". It should refer to "RFC 2637" which is "Point-to-Point Tunneling Protocol (PPTP)". This patch also corrects the typo RFFC.
--- net/netfilter/nf_conntrack_pptp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_conntrack_pptp.c +1 -1
@@ -14,7 +14,7 @@* Limitations: * - We blindly assume that control connections are always * established in PNS->PAC direction. This is a violation -* of RFFC2673 +* of RFC 2637 * - We can only support one single call within each session * TODO: * - testing of incoming PPTP calls
Signature · 1 line
1.7.10.4
[email protected]
maintainerPATCH 7/7 netfilter: nf_ct_helper: better logging for dropped packets
In reply to [email protected]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, ie:
nf_ct_%s: dropping packet: reason ...
--- include/net/netfilter/nf_conntrack_helper.h | 3 + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 10 +-- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 8 +-- net/netfilter/nf_conntrack_amanda.c | 5 +- net/netfilter/nf_conntrack_ftp.c | 10 +-- net/netfilter/nf_conntrack_h323_main.c | 6 +- net/netfilter/nf_conntrack_helper.c | 18 ++++++ net/netfilter/nf_conntrack_irc.c | 7 ++- net/netfilter/nf_conntrack_sane.c | 5 +- net/netfilter/nf_conntrack_sip.c | 80 ++++++++++++++++++------ net/netfilter/nf_conntrack_tftp.c | 8 ++- 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 | 49 +++++++++++---- net/netfilter/nf_nat_tftp.c | 4 +- 16 files changed, 169 insertions(+), 65 deletions(-)
include/net/netfilter/nf_conntrack_helper.h +3 -0
@@ -100,6 +100,9 @@ struct nf_ct_helper_expectfn {void (*expectfn)(struct nf_conn *ct,struct nf_conntrack_expect *exp); }; +extern void nf_ct_helper_log (struct sk_buff *skb,const struct nf_conn *, +const char *fmt, ...); +void nf_ct_helper_expectfn_register (struct nf_ct_helper_expectfn *n);void nf_ct_helper_expectfn_unregister (struct nf_ct_helper_expectfn *n); struct nf_ct_helper_expectfn *
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 +4 -1
@@ -145,6 +145,7 @@ static int amanda_help(struct sk_buff *skb, exp =nf_ct_expect_alloc (ct);if (exp ==NULL ) { +nf_ct_helper_log (skb, ct,"cannot alloc expectation" ); ret =NF_DROP ; goto out; }
@@ -158,8 +159,10 @@ 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_log (skb, ct,"cannot add expectation" ); ret =NF_DROP ; + }nf_ct_expect_put (exp); }
net/netfilter/nf_conntrack_ftp.c +6 -4
@@ -435,8 +435,8 @@ 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_log (skb, ct,"partial matching of `%s'" , + search[dir][i].pattern); ret =NF_DROP ; goto out; }else if (found ==0 ) {/* No match */
@@ -450,6 +450,7 @@ skip_nl_seq: exp =nf_ct_expect_alloc (ct);if (exp ==NULL ) { +nf_ct_helper_log (skb, ct,"cannot alloc expectation" ); ret =NF_DROP ; goto out; }
@@ -500,9 +501,10 @@ 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_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_log (skb, ct,"cannot 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_log (skb, ct,"cannot 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_log (skb, ct,"cannot process RAS message" );return NF_DROP ; }
net/netfilter/nf_conntrack_helper.c +18 -0
@@ -28,6 +28,7 @@#include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_extend.h> +#include <net/netfilter/nf_log.h> static DEFINE_MUTEX (nf_ct_helper_mutex);struct hlist_head *nf_ct_helper_hash__read_mostly ;
@@ -332,6 +333,23 @@ nf_ct_helper_expectfn_find_by_symbol(const void *symbol) }EXPORT_SYMBOL_GPL (nf_ct_helper_expectfn_find_by_symbol); +void nf_ct_helper_log (struct sk_buff *skb,const struct nf_conn *ct, +const char *fmt, ...) +{ +const struct nf_conn_help *help; +const struct nf_conntrack_helper *helper; + +/* Called from the helper function, this call never fails */ + 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); +} +EXPORT_SYMBOL_GPL (nf_ct_helper_log); +int nf_conntrack_helper_register (struct nf_conntrack_helper *me) {int ret =0 ;
net/netfilter/nf_conntrack_irc.c +6 -1
@@ -194,6 +194,8 @@ static int help(struct sk_buff *skb, unsigned int protoff, exp =nf_ct_expect_alloc (ct);if (exp ==NULL ) { +nf_ct_helper_log (skb, ct,"cannot alloc " +"expectation" ); ret =NF_DROP ; goto out; }
@@ -210,8 +212,11 @@ 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_log (skb, ct,"cannot 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_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_log (skb, ct,"cannot add expectation" ); ret =NF_DROP ; + }nf_ct_expect_put (exp);
net/netfilter/nf_conntrack_sip.c +60 -20
187 lines not on this page · raw message
net/netfilter/nf_conntrack_tftp.c +6 -2
@@ -60,8 +60,10 @@ 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_log (skb, ct,"cannot alloc 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 +76,10 @@ 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_log (skb, ct,"cannot 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_log (skb, exp->master,"all ports in use" );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_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_log (skb, ct,"all ports in use" );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_log (skb, ct,"cannot mangle packet" );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_log (skb, exp->master,"all ports in use" );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_log (skb, exp->master,"cannot mangle packet" );nf_ct_unexpect_related (exp); + }return ret; }
net/netfilter/nf_nat_sip.c +37 -12
131 lines not on this page · raw message
net/netfilter/nf_nat_tftp.c +3 -1
@@ -28,8 +28,10 @@ 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_log (skb, exp->master,"cannot add expectation" );return NF_DROP ; + }return NF_ACCEPT ; }
Signature · 1 line
1.7.10.4
Re: [PATCH 7/7] netfilter: nf_ct_helper: better logging for dropped packets
Quoted 3 lines · On Tue, 2013-02-19 at 01:10 +0100, [email protected] wrote:
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, ie:
[]
include/net/netfilter/nf_conntrack_helper.h
Quoted 1 line
include/net/netfilter/nf_conntrack_helper.h +0
-0
[]
include/net/netfilter/nf_conntrack_helper.h struct nf_ct_helper_expectfn { · line 104
Quoted 6 lines
include/net/netfilter/nf_conntrack_helper.h +2
-0@@ -100,6 +100,9 @@ struct nf_ct_helper_expectfn {void (*expectfn)(struct nf_conn *ct,struct nf_conntrack_expect *exp); }; +extern void nf_ct_helper_log (struct sk_buff *skb,const struct nf_conn *, +const char *fmt, ...);
this should be declared
__printf(3, 4)
void nf_ct_helper_log(etc...)
to get the compiler to verify format and arguments.
include/net/netfilter/nf_conntrack_helper.h static int help(struct sk_buff *skb, unsigned int protoff, · line 217
Quoted 8 lines
include/net/netfilter/nf_conntrack_helper.h +3
-1@@ -210,8 +212,11 @@ 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_log (skb, ct,"cannot add " +"expectation" );
do please try to avoid splitting formats
nf_ct_helper_log(skb, ct, "cannot add expectation");
include/net/netfilter/nf_conntrack_helper.h static int process_sdp(struct sk_buff *skb, unsigned int protoff, · line 1135
Quoted 8 lines
include/net/netfilter/nf_conntrack_helper.h +3
-1@@ -1123,8 +1130,11 @@ static int process_sdp(struct sk_buff *skb, unsigned int protoff, dptr, datalen, mediaoff,SDP_HDR_CONNECTION ,SDP_HDR_MEDIA , &rtp_addr); -if (ret !=NF_ACCEPT ) +if (ret !=NF_ACCEPT ) { +nf_ct_helper_log (skb, ct,"cannot mangle " +"media connection" );
here too, etc...
Pablo Neira Ayuso
maintainerRe: [PATCH 7/7] netfilter: nf_ct_helper: better logging for dropped packets
Quoted 11 lines · Joe Perches
Quoted 3 lines · On Tue, 2013-02-19 at 01:10 +0100, [email protected] wrote:
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, ie:
[]
include/net/netfilter/nf_conntrack_helper.h
Quoted 1 line
include/net/netfilter/nf_conntrack_helper.h +0
-0[]
Quoted 4 lines
include/net/netfilter/nf_conntrack_helper.h +0
-0@@ -100,6 +100,9 @@ struct nf_ct_helper_expectfn {void (*expectfn)(struct nf_conn *ct,struct nf_conntrack_expect *exp); };
Quoted 7 lines
include/net/netfilter/nf_conntrack_helper.h struct nf_ct_helper_expectfn { · line 104
Quoted 2 lines
include/net/netfilter/nf_conntrack_helper.h +2
-0+extern void nf_ct_helper_log (struct sk_buff *skb,const struct nf_conn *, +const char *fmt, ...);this should be declared
__printf(3, 4)
voidnf_ct_helper_log(etc...)
Fixed, thanks.
Quoted 13 lines
to get the compiler to verify format and arguments.
include/net/netfilter/nf_conntrack_helper.h static int help(struct sk_buff *skb, unsigned int protoff, · line 217
Quoted 8 lines
include/net/netfilter/nf_conntrack_helper.h +3
-1@@ -210,8 +212,11 @@ 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_log (skb, ct,"cannot add " +"expectation" );do please try to avoid splitting formats
Quoted 2 lines
nf_ct_helper_log(skb, ct, "cannot add expectation");
Done whenever possible, sometimes I see myself forced to split them to fit 80-chars per column.
Quoted 1 line
From
0a477cb690ba84ab0cf98364b2f094eff3b70d6fMon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <[email protected]>
Date: Sun, 10 Feb 2013 18:56:56 +0100
Subject: [PATCH] netfilter: nf_ct_helper: better logging for dropped packets
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, ie:
nf_ct_%s: dropping packet: reason ...
--- include/net/netfilter/nf_conntrack_helper.h | 4 ++ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 10 +-- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 8 +-- net/netfilter/nf_conntrack_amanda.c | 5 +- net/netfilter/nf_conntrack_ftp.c | 10 +-- net/netfilter/nf_conntrack_h323_main.c | 6 +- net/netfilter/nf_conntrack_helper.c | 19 ++++++ net/netfilter/nf_conntrack_irc.c | 7 ++- net/netfilter/nf_conntrack_sane.c | 5 +- net/netfilter/nf_conntrack_sip.c | 80 ++++++++++++++++++------ net/netfilter/nf_conntrack_tftp.c | 8 ++- 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 | 49 +++++++++++---- net/netfilter/nf_nat_tftp.c | 4 +- 16 files changed, 171 insertions(+), 65 deletions(-)
include/net/netfilter/nf_conntrack_helper.h +4 -0
@@ -100,6 +100,10 @@ struct nf_ct_helper_expectfn {void (*expectfn)(struct nf_conn *ct,struct nf_conntrack_expect *exp); }; +extern __printf(3,4) void nf_ct_helper_log(struct sk_buff *skb, + const struct nf_conn *, + const char *fmt, ...); + void nf_ct_helper_expectfn_register(struct nf_ct_helper_expectfn *n); void nf_ct_helper_expectfn_unregister(struct nf_ct_helper_expectfn *n); struct nf_ct_helper_expectfn *
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 +4 -1
@@ -145,6 +145,7 @@ static int amanda_help(struct sk_buff *skb, exp =nf_ct_expect_alloc (ct);if (exp ==NULL ) { +nf_ct_helper_log (skb, ct,"cannot alloc expectation" ); ret =NF_DROP ; goto out; }
@@ -158,8 +159,10 @@ 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_log (skb, ct,"cannot add expectation" ); ret =NF_DROP ; + }nf_ct_expect_put (exp); }
net/netfilter/nf_conntrack_ftp.c +6 -4
@@ -435,8 +435,8 @@ 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_log (skb, ct,"partial matching of `%s'" , + search[dir][i].pattern); ret =NF_DROP ; goto out; }else if (found ==0 ) {/* No match */
@@ -450,6 +450,7 @@ skip_nl_seq: exp =nf_ct_expect_alloc (ct);if (exp ==NULL ) { +nf_ct_helper_log (skb, ct,"cannot alloc expectation" ); ret =NF_DROP ; goto out; }
@@ -500,9 +501,10 @@ 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_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_log (skb, ct,"cannot 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_log (skb, ct,"cannot 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_log (skb, ct,"cannot process RAS message" );return NF_DROP ; }
net/netfilter/nf_conntrack_helper.c +19 -0
@@ -28,6 +28,7 @@#include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_extend.h> +#include <net/netfilter/nf_log.h> static DEFINE_MUTEX (nf_ct_helper_mutex);struct hlist_head *nf_ct_helper_hash__read_mostly ;
@@ -332,6 +333,24 @@ nf_ct_helper_expectfn_find_by_symbol(const void *symbol) }EXPORT_SYMBOL_GPL (nf_ct_helper_expectfn_find_by_symbol); +__printf(3, 4) +void nf_ct_helper_log (struct sk_buff *skb,const struct nf_conn *ct, +const char *fmt, ...) +{ +const struct nf_conn_help *help; +const struct nf_conntrack_helper *helper; + +/* Called from the helper function, this call never fails */ + 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); +} +EXPORT_SYMBOL_GPL (nf_ct_helper_log); +int nf_conntrack_helper_register (struct nf_conntrack_helper *me) {int ret =0 ;
net/netfilter/nf_conntrack_irc.c +6 -1
@@ -194,6 +194,8 @@ static int help(struct sk_buff *skb, unsigned int protoff, exp =nf_ct_expect_alloc (ct);if (exp ==NULL ) { +nf_ct_helper_log (skb, ct, +"cannot alloc expectation" ); ret =NF_DROP ; goto out; }
@@ -210,8 +212,11 @@ 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_log (skb, ct, +"cannot 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_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_log (skb, ct,"cannot add expectation" ); ret =NF_DROP ; + }nf_ct_expect_put (exp);
net/netfilter/nf_conntrack_sip.c +60 -20
187 lines not on this page · raw message
net/netfilter/nf_conntrack_tftp.c +6 -2
@@ -60,8 +60,10 @@ 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_log (skb, ct,"cannot alloc 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 +76,10 @@ 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_log (skb, ct,"cannot 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_log (skb, exp->master,"all ports in use" );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_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_log (skb, ct,"all ports in use" );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_log (skb, ct,"cannot mangle packet" );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_log (skb, exp->master,"all ports in use" );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_log (skb, exp->master,"cannot mangle packet" );nf_ct_unexpect_related (exp); + }return ret; }
net/netfilter/nf_nat_sip.c +37 -12
131 lines not on this page · raw message
net/netfilter/nf_nat_tftp.c +3 -1
@@ -28,8 +28,10 @@ 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_log (skb, exp->master,"cannot add expectation" );return NF_DROP ; + }return NF_ACCEPT ; }
Signature · 1 line
1.7.10.4
Re: [PATCH 7/7] netfilter: nf_ct_helper: better logging for dropped packets
Quoted 8 lines · Pablo Neira Ayuso
Quoted 7 lines · Joe Perches
Quoted 3 lines · On Tue, 2013-02-19 at 01:10 +0100, [email protected] wrote:
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, ie:
[]
include/net/netfilter/nf_conntrack_helper.h
Quoted 1 line
include/net/netfilter/nf_conntrack_helper.h +0
-0[]
[]
Quoted 7 lines
Quoted 4 lines
do please try to avoid splitting formats
nf_ct_helper_log(skb, ct, "cannot add expectation");Done whenever possible, sometimes I see myself forced to split them to fit 80-chars per column.
It's always possible.
Just ignore line length limitations for formats.
If the formats are on a separate line, checkpatch won't complain either.
If nf_cg_helper_log was named nf_cg_helper_printk checkpatch wouldn't complain if the original line with format was > 80 cols
nf_ct_helper_printk(skb, ct, "some really long format past 80 cols ...");
but then the log isn't really a printk either and that's a checkpatch limitation on understanding what is and isn't a logging output function.
Pablo Neira Ayuso
maintainerRe: [PATCH 7/7] netfilter: nf_ct_helper: better logging for dropped packets
Quoted 29 lines · Joe Perches
Quoted 8 lines · Pablo Neira Ayuso
Quoted 7 lines · Joe Perches
Quoted 3 lines · On Tue, 2013-02-19 at 01:10 +0100, [email protected] wrote:
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, ie:
[]
include/net/netfilter/nf_conntrack_helper.h
Quoted 1 line
include/net/netfilter/nf_conntrack_helper.h +0
-0[]
[]
Quoted 7 lines
Quoted 4 lines
do please try to avoid splitting formats
nf_ct_helper_log(skb, ct, "cannot add expectation");Done whenever possible, sometimes I see myself forced to split them to fit 80-chars per column.
It's always possible.
Just ignore line length limitations for formats.
If the formats are on a separate line, checkpatch won't complain either.
If
nf_cg_helper_logwas namednf_cg_helper_printkcheckpatch wouldn't complain if the original line with format was > 80 cols
Quoted 5 lines
nf_ct_helper_printk(skb, ct, "some really long format past 80 cols ...");but then the log isn't really a printk either and that's a checkpatch limitation on understanding what is and isn't a logging output function.
I have shortened several log descriptions, that should help. New patch attached.
Thanks for the explanation, will be useful for the next time.
Quoted 1 line
From
e91e8b6a6f65c46484ca876ee26b53ab04aa389cMon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <[email protected]>
Date: Sun, 10 Feb 2013 18:56:56 +0100
Subject: [PATCH 7/7] netfilter: nf_ct_helper: better logging for dropped packets
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, ie:
nf_ct_%s: dropping packet: reason ...
--- include/net/netfilter/nf_conntrack_helper.h | 4 ++ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 10 +--- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 8 +-- net/netfilter/nf_conntrack_amanda.c | 5 +- net/netfilter/nf_conntrack_ftp.c | 10 ++-- net/netfilter/nf_conntrack_h323_main.c | 6 +- net/netfilter/nf_conntrack_helper.c | 19 ++++++ net/netfilter/nf_conntrack_irc.c | 7 ++- net/netfilter/nf_conntrack_sane.c | 5 +- net/netfilter/nf_conntrack_sip.c | 73 +++++++++++++++++------- net/netfilter/nf_conntrack_tftp.c | 8 ++- 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 | 49 ++++++++++++---- net/netfilter/nf_nat_tftp.c | 4 +- 16 files changed, 164 insertions(+), 65 deletions(-)
include/net/netfilter/nf_conntrack_helper.h +4 -0
@@ -100,6 +100,10 @@ struct nf_ct_helper_expectfn {void (*expectfn)(struct nf_conn *ct,struct nf_conntrack_expect *exp); }; +extern __printf(3,4) void nf_ct_helper_log(struct sk_buff *skb, + const struct nf_conn *, + const char *fmt, ...); + void nf_ct_helper_expectfn_register(struct nf_ct_helper_expectfn *n); void nf_ct_helper_expectfn_unregister(struct nf_ct_helper_expectfn *n); struct nf_ct_helper_expectfn *
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 +4 -1
@@ -145,6 +145,7 @@ static int amanda_help(struct sk_buff *skb, exp =nf_ct_expect_alloc (ct);if (exp ==NULL ) { +nf_ct_helper_log (skb, ct,"cannot alloc expectation" ); ret =NF_DROP ; goto out; }
@@ -158,8 +159,10 @@ 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_log (skb, ct,"cannot add expectation" ); ret =NF_DROP ; + }nf_ct_expect_put (exp); }
net/netfilter/nf_conntrack_ftp.c +6 -4
@@ -435,8 +435,8 @@ 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_log (skb, ct,"partial matching of `%s'" , + search[dir][i].pattern); ret =NF_DROP ; goto out; }else if (found ==0 ) {/* No match */
@@ -450,6 +450,7 @@ skip_nl_seq: exp =nf_ct_expect_alloc (ct);if (exp ==NULL ) { +nf_ct_helper_log (skb, ct,"cannot alloc expectation" ); ret =NF_DROP ; goto out; }
@@ -500,9 +501,10 @@ 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_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_log (skb, ct,"cannot 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_log (skb, ct,"cannot 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_log (skb, ct,"cannot process RAS message" );return NF_DROP ; }
net/netfilter/nf_conntrack_helper.c +19 -0
@@ -28,6 +28,7 @@#include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_extend.h> +#include <net/netfilter/nf_log.h> static DEFINE_MUTEX (nf_ct_helper_mutex);struct hlist_head *nf_ct_helper_hash__read_mostly ;
@@ -332,6 +333,24 @@ nf_ct_helper_expectfn_find_by_symbol(const void *symbol) }EXPORT_SYMBOL_GPL (nf_ct_helper_expectfn_find_by_symbol); +__printf(3, 4) +void nf_ct_helper_log (struct sk_buff *skb,const struct nf_conn *ct, +const char *fmt, ...) +{ +const struct nf_conn_help *help; +const struct nf_conntrack_helper *helper; + +/* Called from the helper function, this call never fails */ + 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); +} +EXPORT_SYMBOL_GPL (nf_ct_helper_log); +int nf_conntrack_helper_register (struct nf_conntrack_helper *me) {int ret =0 ;
net/netfilter/nf_conntrack_irc.c +6 -1
@@ -194,6 +194,8 @@ static int help(struct sk_buff *skb, unsigned int protoff, exp =nf_ct_expect_alloc (ct);if (exp ==NULL ) { +nf_ct_helper_log (skb, ct, +"cannot alloc expectation" ); ret =NF_DROP ; goto out; }
@@ -210,8 +212,11 @@ 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_log (skb, ct, +"cannot 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_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_log (skb, ct,"cannot add expectation" ); ret =NF_DROP ; + }nf_ct_expect_put (exp);
net/netfilter/nf_conntrack_sip.c +53 -20
180 lines not on this page · raw message
net/netfilter/nf_conntrack_tftp.c +6 -2
@@ -60,8 +60,10 @@ 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_log (skb, ct,"cannot alloc 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 +76,10 @@ 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_log (skb, ct,"cannot 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_log (skb, exp->master,"all ports in use" );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_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_log (skb, ct,"all ports in use" );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_log (skb, ct,"cannot mangle packet" );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_log (skb, exp->master,"all ports in use" );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_log (skb, exp->master,"cannot mangle packet" );nf_ct_unexpect_related (exp); + }return ret; }
net/netfilter/nf_nat_sip.c +37 -12
131 lines not on this page · raw message
net/netfilter/nf_nat_tftp.c +3 -1
@@ -28,8 +28,10 @@ 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_log (skb, exp->master,"cannot add expectation" );return NF_DROP ; + }return NF_ACCEPT ; }
Signature · 1 line
1.7.10.4
Re: [PATCH 7/7] netfilter: nf_ct_helper: better logging for dropped packets
In reply to Pablo Neira AyusoQuoted 17 lines · Pablo Neira Ayuso
Quoted 16 lines · Joe Perches
Quoted 3 lines · On Tue, 2013-02-19 at 01:10 +0100, [email protected] wrote:
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, ie:
[]
include/net/netfilter/nf_conntrack_helper.h
Quoted 1 line
include/net/netfilter/nf_conntrack_helper.h +0
-0[]
include/net/netfilter/nf_conntrack_helper.h struct nf_ct_helper_expectfn { · line 104
Quoted 6 lines
include/net/netfilter/nf_conntrack_helper.h +2
-0@@ -100,6 +100,9 @@ struct nf_ct_helper_expectfn {void (*expectfn)(struct nf_conn *ct,struct nf_conntrack_expect *exp); }; +extern void nf_ct_helper_log (struct sk_buff *skb,const struct nf_conn *, +const char *fmt, ...);this should be declared
Quoted 4 lines
Quoted 2 lines
__printf(3, 4)
voidnf_ct_helper_log(etc...)Fixed, thanks.
Well, not really.
The new prototype is:
+extern __printf(3,4) void nf_ct_helper_log(struct sk_buff *skb,
+ const struct nf_conn *,
+ const char *fmt, ...);
+
The extern isn't necessary.
The second arg doesn't have a name.
The printf args could use a space between them.
I think this should be
__printf(3, 4)
void nf_ct_helper_log(struct sk_buff *skb, const struct nf_conn *ct,
const char *fmt, ...);
without the extern to be more like the prototypes that follow it in that file.
Pablo Neira Ayuso
maintainerRe: [PATCH 7/7] netfilter: nf_ct_helper: better logging for dropped packets
Quoted 36 lines · Joe Perches
Quoted 17 lines · Pablo Neira Ayuso
Quoted 16 lines · Joe Perches
Quoted 3 lines · On Tue, 2013-02-19 at 01:10 +0100, [email protected] wrote:
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, ie:
[]
include/net/netfilter/nf_conntrack_helper.h
Quoted 1 line
include/net/netfilter/nf_conntrack_helper.h +0
-0[]
include/net/netfilter/nf_conntrack_helper.h struct nf_ct_helper_expectfn { · line 104
Quoted 6 lines
include/net/netfilter/nf_conntrack_helper.h +2
-0@@ -100,6 +100,9 @@ struct nf_ct_helper_expectfn {void (*expectfn)(struct nf_conn *ct,struct nf_conntrack_expect *exp); }; +extern void nf_ct_helper_log (struct sk_buff *skb,const struct nf_conn *, +const char *fmt, ...);this should be declared
Quoted 4 lines
Quoted 2 lines
__printf(3, 4)
voidnf_ct_helper_log(etc...)Fixed, thanks.
Well, not really.
The new prototype is:
(quoted diff) +4
-0+extern __printf(3,4) void nf_ct_helper_log(struct sk_buff *skb, + const struct nf_conn *, + const char *fmt, ...); +The extern isn't necessary.
The second arg doesn't have a name.
The printf args could use a space between them.
Quoted 8 lines
I think this should be
__printf(3, 4)
void nf_ct_helper_log(structsk_buff*skb, const structnf_conn*ct,const char *fmt, ...);without the extern to be more like the prototypes that follow it in that file.
Done, thanks.
Quoted 1 line
From
b20ab9cc63ca4605aec154cf54faa8455749f3f6Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <[email protected]>
Date: Sun, 10 Feb 2013 18:56:56 +0100
Subject: [PATCH 7/7] netfilter: nf_ct_helper: better logging for dropped packets
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, ie:
nf_ct_%s: dropping packet: reason ...
Thanks to Joe Perches for many formatting suggestions.
--- include/net/netfilter/nf_conntrack_helper.h | 4 ++ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 10 +--- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 8 +-- net/netfilter/nf_conntrack_amanda.c | 5 +- net/netfilter/nf_conntrack_ftp.c | 10 ++-- net/netfilter/nf_conntrack_h323_main.c | 6 +- net/netfilter/nf_conntrack_helper.c | 19 ++++++ net/netfilter/nf_conntrack_irc.c | 7 ++- net/netfilter/nf_conntrack_sane.c | 5 +- net/netfilter/nf_conntrack_sip.c | 73 +++++++++++++++++------- net/netfilter/nf_conntrack_tftp.c | 8 ++- 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 | 49 ++++++++++++---- net/netfilter/nf_nat_tftp.c | 4 +- 16 files changed, 164 insertions(+), 65 deletions(-)
include/net/netfilter/nf_conntrack_helper.h +4 -0
@@ -100,6 +100,10 @@ struct nf_ct_helper_expectfn {void (*expectfn)(struct nf_conn *ct,struct nf_conntrack_expect *exp); }; +__printf(3,4) +void nf_ct_helper_log (struct sk_buff *skb,const struct nf_conn *ct, +const char *fmt, ...); +void nf_ct_helper_expectfn_register (struct nf_ct_helper_expectfn *n);void nf_ct_helper_expectfn_unregister (struct nf_ct_helper_expectfn *n); struct nf_ct_helper_expectfn *
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 +4 -1
@@ -145,6 +145,7 @@ static int amanda_help(struct sk_buff *skb, exp =nf_ct_expect_alloc (ct);if (exp ==NULL ) { +nf_ct_helper_log (skb, ct,"cannot alloc expectation" ); ret =NF_DROP ; goto out; }
@@ -158,8 +159,10 @@ 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_log (skb, ct,"cannot add expectation" ); ret =NF_DROP ; + }nf_ct_expect_put (exp); }
net/netfilter/nf_conntrack_ftp.c +6 -4
@@ -435,8 +435,8 @@ 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_log (skb, ct,"partial matching of `%s'" , + search[dir][i].pattern); ret =NF_DROP ; goto out; }else if (found ==0 ) {/* No match */
@@ -450,6 +450,7 @@ skip_nl_seq: exp =nf_ct_expect_alloc (ct);if (exp ==NULL ) { +nf_ct_helper_log (skb, ct,"cannot alloc expectation" ); ret =NF_DROP ; goto out; }
@@ -500,9 +501,10 @@ 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_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_log (skb, ct,"cannot 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_log (skb, ct,"cannot 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_log (skb, ct,"cannot process RAS message" );return NF_DROP ; }
net/netfilter/nf_conntrack_helper.c +19 -0
@@ -28,6 +28,7 @@#include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_extend.h> +#include <net/netfilter/nf_log.h> static DEFINE_MUTEX (nf_ct_helper_mutex);struct hlist_head *nf_ct_helper_hash__read_mostly ;
@@ -332,6 +333,24 @@ nf_ct_helper_expectfn_find_by_symbol(const void *symbol) }EXPORT_SYMBOL_GPL (nf_ct_helper_expectfn_find_by_symbol); +__printf(3, 4) +void nf_ct_helper_log (struct sk_buff *skb,const struct nf_conn *ct, +const char *fmt, ...) +{ +const struct nf_conn_help *help; +const struct nf_conntrack_helper *helper; + +/* Called from the helper function, this call never fails */ + 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); +} +EXPORT_SYMBOL_GPL (nf_ct_helper_log); +int nf_conntrack_helper_register (struct nf_conntrack_helper *me) {int ret =0 ;
net/netfilter/nf_conntrack_irc.c +6 -1
@@ -194,6 +194,8 @@ static int help(struct sk_buff *skb, unsigned int protoff, exp =nf_ct_expect_alloc (ct);if (exp ==NULL ) { +nf_ct_helper_log (skb, ct, +"cannot alloc expectation" ); ret =NF_DROP ; goto out; }
@@ -210,8 +212,11 @@ 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_log (skb, ct, +"cannot 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_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_log (skb, ct,"cannot add expectation" ); ret =NF_DROP ; + }nf_ct_expect_put (exp);
net/netfilter/nf_conntrack_sip.c +53 -20
180 lines not on this page · raw message
net/netfilter/nf_conntrack_tftp.c +6 -2
@@ -60,8 +60,10 @@ 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_log (skb, ct,"cannot alloc 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 +76,10 @@ 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_log (skb, ct,"cannot 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_log (skb, exp->master,"all ports in use" );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_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_log (skb, ct,"all ports in use" );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_log (skb, ct,"cannot mangle packet" );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_log (skb, exp->master,"all ports in use" );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_log (skb, exp->master,"cannot mangle packet" );nf_ct_unexpect_related (exp); + }return ret; }
net/netfilter/nf_nat_sip.c +37 -12
131 lines not on this page · raw message
net/netfilter/nf_nat_tftp.c +3 -1
@@ -28,8 +28,10 @@ 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_log (skb, exp->master,"cannot add expectation" );return NF_DROP ; + }return NF_ACCEPT ; }
Signature · 1 line
1.7.10.4
Re: [PATCH 7/7] netfilter: nf_ct_helper: Fix logging for dropped packets
Quoted 8 lines · Pablo Neira Ayuso
Quoted 7 lines · Joe Perches
Quoted 6 lines · Pablo Neira Ayuso
Quoted 5 lines · Joe Perches
Quoted 3 lines · On Tue, 2013-02-19 at 01:10 +0100, [email protected] wrote:
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, ie:
[]
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
include/net/netfilter/nf_conntrack_helper.h
Quoted 1 line
include/net/netfilter/nf_conntrack_helper.h +0
-0[]
include/net/netfilter/nf_conntrack_helper.h struct nf_ct_helper_expectfn { · line 104
Quoted 6 lines
include/net/netfilter/nf_conntrack_helper.h +2
-0@@ -100,6 +100,9 @@ struct nf_ct_helper_expectfn {void (*expectfn)(struct nf_conn *ct,struct nf_conntrack_expect *exp); }; +extern void nf_ct_helper_log (struct sk_buff *skb,const struct nf_conn *, +const char *fmt, ...);
Hi again Pablo.
Sorry, I didn't look at the function implementation.
It doesn't use the var args that follow fmt.
Two current uses have format and args aren't emitted correctly.
This is needed:
From: Joe Perches <[email protected]>
Update nf_ct_helper_log to emit args along with the format.
--- net/netfilter/nf_conntrack_helper.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
net/netfilter/nf_conntrack_helper.c +10 -1
@@ -341,6 +341,13 @@ void nf_ct_helper_log(struct sk_buff *skb, const struct nf_conn *ct, {const struct nf_conn_help *help;const struct nf_conntrack_helper *helper; +struct va_format vaf; +va_list args; + +va_start (args, fmt); + + vaf.fmt = fmt; + vaf.va = &args;/* Called from the helper function, this call never fails */ help =nfct_help (ct);
@@ -349,7 +356,9 @@ void nf_ct_helper_log(struct sk_buff *skb, const struct nf_conn *ct, 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); +"nf_ct_%s: dropping packet: %pV" , helper->name, &vaf); + +va_end (args); }EXPORT_SYMBOL_GPL (nf_ct_helper_log);
Pablo Neira Ayuso
maintainerRe: [PATCH 7/7] netfilter: nf_ct_helper: Fix logging for dropped packets
Quoted 5 lines · Joe Perches
Sorry, I didn't look at the function implementation.
It doesn't use the var args that follow fmt.
Two current uses have format and args aren't emitted correctly.
Thanks Joe, will pass this to David asap.
Regards.
David Miller
maintainerFrom: [email protected]
Date: Tue, 19 Feb 2013 01:10:44 +0100
Quoted 8 lines
The following patchset contain updates for your net-next tree, they are:
* Fix (for just added) connlabel dependencies, from Florian Westphal.
* Add aliasing support for conntrack, thus users can either use -m state or -m conntrack from iptables while using the same kernel module, from Jozsef Kadlecsik.
Quoted 8 lines
* Some code refactoring for the CT target to merge common code in revision 0 and 1, from myself.
* Add aliasing support for CT, based on patch from Jozsef Kadlecsik.
* Add one mutex per nfnetlink subsystem, from myself.
* Improved logging for packets that are dropped by helpers, from myself.
Pulled, thanks Pablo.