On 3/17/22 08:49, Pablo Neira Ayuso wrote: > On Wed, Mar 16, 2022 at 12:20:05PM -0700, Randy Dunlap wrote: >> 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 > > LGTM. > > Should I route this through the netfilter tree? Yes, please. Thanks. > >> Fixes: f587de0e2feb ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port") >> Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> >> Cc: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> >> Cc: Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> >> Cc: Florian Westphal <fw@xxxxxxxxx> >> Cc: netfilter-devel@xxxxxxxxxxxxxxx >> Cc: coreteam@xxxxxxxxxxxxx >> Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> >> Cc: Jakub Kicinski <kuba@xxxxxxxxxx> >> Cc: netdev@xxxxxxxxxxxxxxx >> --- >> net/ipv4/netfilter/nf_nat_h323.c | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> --- lnx-517-rc8.orig/net/ipv4/netfilter/nf_nat_h323.c >> +++ lnx-517-rc8/net/ipv4/netfilter/nf_nat_h323.c >> @@ -580,7 +580,7 @@ static struct nf_ct_helper_expectfn call >> }; >> >> /****************************************************************************/ >> -static int __init init(void) >> +static int __init nf_nat_h323_init(void) >> { >> BUG_ON(set_h245_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_h225_addr_hook, NULL); >> @@ -624,8 +624,8 @@ static void __exit fini(void) >> } >> >> /****************************************************************************/ >> -module_init(init); >> -module_exit(fini); >> +module_init(nf_nat_h323_init); >> +module_exit(nf_nat_h323_fini); >> >> MODULE_AUTHOR("Jing Min Zhao <zhaojingmin@xxxxxxxxxxxxxxxxxxxxx>"); >> MODULE_DESCRIPTION("H.323 NAT helper"); -- ~Randy _______________________________________________ Virtualization mailing list Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linuxfoundation.org/mailman/listinfo/virtualization