Remove debugging messages from nfnetlink
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/7 Remove debugging messages from nfnetlink
Remove early debugging messages from nfnetlink
Signed-off-by Pablo Neira Ayuso <[email protected]>
Signature · 2 lines
The dawn of the fourth age of Linux firewalling is coming; a time of great struggle and heroic deeds -- J.Kadlecsik got inspired by J.Morris
[PATCH] Remove debugging messages from nfnetlink
Remove early debugging messages from nfnetlink
Signed-off-by Pablo Neira Ayuso <[email protected]>
net/netfilter/nfnetlink.c +6 -36
@@ -3,7 +3,7 @@* * (C) 2001 by Jay Schulist <[email protected]>, * (C) 2002-2005 by Harald Welte <[email protected]> -* (C) 2005 by Pablo Neira Ayuso <[email protected]> +* (C) 2005,2007 by Pablo Neira Ayuso <[email protected]> * * Initial netfilter messages via netlink development funded and * generally made possible by Network Robots, Inc. (www.networkrobots.com)
@@ -42,14 +42,6 @@ MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NEstatic char __initdata nfversion[] ="0.30" ; -#if 0 -#define DEBUGP(format, args...) \ - printk(KERN_DEBUG "%s(%d):%s(): " format, __FILE__, \ - __LINE__, __FUNCTION__, ## args) -#else -#define DEBUGP(format, args...) -#endif -static struct sock *nfnl =NULL ;static struct nfnetlink_subsystem *subsys_table[NFNL_SUBSYS_COUNT ];DECLARE_MUTEX (nfnl_sem);
@@ -66,8 +58,6 @@ void nfnl_unlock(void)int nfnetlink_subsys_register (struct nfnetlink_subsystem *n) { -DEBUGP ("registering subsystem ID %u\n" , n->subsys_id); -nfnl_lock ();if (subsys_table[n->subsys_id]) {nfnl_unlock ();
@@ -81,8 +71,6 @@ int nfnetlink_subsys_register(struct nfnint nfnetlink_subsys_unregister (struct nfnetlink_subsystem *n) { -DEBUGP ("unregistering subsystem ID %u\n" , n->subsys_id); -nfnl_lock (); subsys_table[n->subsys_id] =NULL ;nfnl_unlock ();
@@ -106,10 +94,8 @@ nfnetlink_find_client(u_int16_t type, st {u_int8_t cb_id =NFNL_MSG_TYPE (type); -if (cb_id >= ss->cb_count) { -DEBUGP ("msgtype %u >= %u, returning\n" , type, ss->cb_count); +if (cb_id >= ss->cb_count)return NULL ; - }return &ss->cb[cb_id]; }
@@ -155,11 +141,8 @@ nfnetlink_check_attributes(struct nfnetlu_int16_t attr_count;u_int8_t cb_id =NFNL_MSG_TYPE (nlh->nlmsg_type); -if (unlikely (cb_id >= subsys->cb_count)) { -DEBUGP ("msgtype %u >= %u, returning\n" , - cb_id, subsys->cb_count); +if (unlikely (cb_id >= subsys->cb_count))return -EINVAL ; - } min_len =NLMSG_SPACE (sizeof (struct nfgenmsg ));if (unlikely (nlh->nlmsg_len < min_len))
@@ -224,27 +207,18 @@ static int nfnetlink_rcv_msg(struct sk_bstruct nfnetlink_subsystem *ss;int type, err =0 ; -DEBUGP ("entered; subsys=%u, msgtype=%u\n" , -NFNL_SUBSYS_ID (nlh->nlmsg_type), -NFNL_MSG_TYPE (nlh->nlmsg_type)); -if (security_netlink_recv (skb,CAP_NET_ADMIN )) { -DEBUGP ("missing CAP_NET_ADMIN\n" ); *errp = -EPERM ;return -1 ; }/* Only requests are handled by kernel now. */ -if (!(nlh->nlmsg_flags &NLM_F_REQUEST )) { -DEBUGP ("received non-request message\n" ); +if (!(nlh->nlmsg_flags &NLM_F_REQUEST ))return 0 ; - }/* All the messages must at least contain nfgenmsg */ -if (nlh->nlmsg_len <NLMSG_SPACE (sizeof (struct nfgenmsg ))) { -DEBUGP ("received message was too short\n" ); +if (nlh->nlmsg_len <NLMSG_SPACE (sizeof (struct nfgenmsg )))return 0 ; - } type = nlh->nlmsg_type; ss =nfnetlink_get_subsys (type);
@@ -262,10 +236,8 @@ static int nfnetlink_rcv_msg(struct sk_b } nc =nfnetlink_find_client (type, ss); -if (!nc) { -DEBUGP ("unable to find client for type %d\n" , type); +if (!nc) goto err_inval; - } { u_int16_t attr_count =
@@ -278,14 +250,12 @@ static int nfnetlink_rcv_msg(struct sk_bif (err <0 ) goto err_inval; -DEBUGP ("calling handler\n" ); err = nc->call (nfnl, skb, nlh, cda, errp); *errp = err;return err; } err_inval: -DEBUGP ("returning -EINVAL\n" ); *errp = -EINVAL ;return -1 ; }
This doesn't apply, it seems like you generated the patches against a kernel tree without Yoshifuji's whitespace cleanup. Please rediff and resend (the faster the better if we want to get this in 2.6.21). I'll just comment on the patches for now.
Quoted 3 lines · Pablo Neira Ayuso
[PATCH] Remove debugging messages from nfnetlink
Remove early debugging messages from nfnetlink
Looks good, I'll also happily apply similar patches for other netfilter files.