leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netfilter: nf_nat_h323: eliminate anonymous module_init & module_exit

Browse Source 
Eliminate anonymous module_init() and module_exit(), which can lead to
confusion or ambiguity when reading System.map, crashes/oops/bugs,
or an initcall_debug log.

Give each of these init and exit functions unique driver-specific
names to eliminate the anonymous names.

Example 1: (System.map)
 ffffffff832fc78c t init
 ffffffff832fc79e t init
 ffffffff832fc8f8 t init

Example 2: (initcall_debug log)
 calling  init+0x0/0x12 @ 1
 initcall init+0x0/0x12 returned 0 after 15 usecs
 calling  init+0x0/0x60 @ 1
 initcall init+0x0/0x60 returned 0 after 2 usecs
 calling  init+0x0/0x9a @ 1
 initcall init+0x0/0x9a returned 0 after 74 usecs

Fixes: f587de0e2f ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Randy Dunlap 2022-03-16 12:20:05 -07:00 committed by Pablo Neira Ayuso
parent e86dbdb9d4
commit fd42139290
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/ipv4/netfilter/nf_nat_h323.c
View File

@ -580,7 +580,7 @@ static struct nf_ct_helper_expectfn callforwarding_nat = {
}; };
/****************************************************************************/ /****************************************************************************/
static int __init init(void) static int __init nf_nat_h323_init(void)
{ {
BUG_ON(set_h245_addr_hook != NULL); BUG_ON(set_h245_addr_hook != NULL);
BUG_ON(set_h225_addr_hook != NULL); BUG_ON(set_h225_addr_hook != NULL);
@ -607,7 +607,7 @@ static int __init init(void)
} }
/****************************************************************************/ /****************************************************************************/
static void __exit fini(void) static void __exit nf_nat_h323_fini(void)
{ {
RCU_INIT_POINTER(set_h245_addr_hook, NULL); RCU_INIT_POINTER(set_h245_addr_hook, NULL);
RCU_INIT_POINTER(set_h225_addr_hook, NULL); RCU_INIT_POINTER(set_h225_addr_hook, NULL);
@ -624,8 +624,8 @@ static void __exit fini(void)
} }
/****************************************************************************/ /****************************************************************************/
module_init(init); module_init(nf_nat_h323_init);
module_exit(fini); module_exit(nf_nat_h323_fini);
MODULE_AUTHOR("Jing Min Zhao <zhaojingmin@users.sourceforge.net>"); MODULE_AUTHOR("Jing Min Zhao <zhaojingmin@users.sourceforge.net>");
MODULE_DESCRIPTION("H.323 NAT helper"); MODULE_DESCRIPTION("H.323 NAT helper");