appletalk: prevent unregister_sysctl_table() with a NULL argument
PATCH 1/1 appletalk: prevent unregister_sysctl_table() with a NULL argument
If register_sysctl_table() fails during module initalization, NULL pointer dereference will happen in the module cleanup.
net/appletalk/sysctl_net_atalk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/appletalk/sysctl_net_atalk.c +2 -1
@@ -78,5 +78,6 @@ void atalk_register_sysctl(void)void atalk_unregister_sysctl (void ) { -unregister_sysctl_table (atalk_table_header); +if (atalk_table_header) +unregister_sysctl_table (atalk_table_header); }
Quoted 3 lines · Akinobu Mita
If
register_sysctl_table()fails during module initalization, NULL pointer dereference will happen in the module cleanup.
The only way this would happen at atalk_unregister_sysctl is if the kmalloc failed on register_sysctl_table during init. In that case there is no need to unregister atalk in the first place since it never came up, so this doesn't appear to be the correct fix. Even if it were possible, this check should be done at atalk_exit instead of atalk_unregister_sysctl.
David
Quoted 3 lines · David Rientjes
The only way this would happen at
atalk_unregister_sysctlis if the kmalloc failed onregister_sysctl_tableduring init. In that case there is no need to unregister atalk in the first place since it never came up,
Yes. this patch doesn't cause failure if sysctl registration failed. It aims to avoid that minor possible NULL pointer dereference.
Quoted 3 lines
so this doesn't appear to be the correct fix. Even if it were possible, this check should be done at
atalk_exitinstead ofatalk_unregister_sysctl.
Are there any difference?
Because atalk_unregister_sysctl() is only called from atalk_exit(). And atalk_table_header is static variable. So there is no way to know whether sysclt registration was succeeded or not. Or is it better to export atalk_table_header for that check from atalk_exit()?
net/appletalk/sysctl_net_atalk.c void atalk_register_sysctl(void) · line 82
Quoted 12 lines · Akinobu Mita
If
register_sysctl_table()fails during module initalization, NULL pointer dereference will happen in the module cleanup.net/appletalk/sysctl_net_atalk.c +2
-1@@ -78,5 +78,6 @@ void atalk_register_sysctl(void)void atalk_unregister_sysctl (void ) { -unregister_sysctl_table (atalk_table_header); +if (atalk_table_header) +unregister_sysctl_table (atalk_table_header);
Make sure that module won't load if sysctl table can't be registered, instead.
Quoted 9 lines · Akinobu Mita
Quoted 3 lines · David Rientjes
The only way this would happen at
atalk_unregister_sysctlis if the kmalloc failed onregister_sysctl_tableduring init. In that case there is no need to unregister atalk in the first place since it never came up,Yes. this patch doesn't cause failure if sysctl registration failed. It aims to avoid that minor possible NULL pointer dereference.
That dereference should never be possible. If sysctl registration fails, it should not be left partially initialized so that it would ever need to be cleaned up later; it should just fail to register. So the fix, if indeed one is required in this instance that you have witnessed, should be an immediate response to an -ENOMEM on register_sysctl_table. Adding this to atalk_unregister_sysctl is incorrect because that function should only be entered given the condition that the register was successful, which in this case it was not.
David
PATCH 1/1 appletalk: handle errors during module_init
In reply to Alexey DobriyanQuoted 2 lines · Alexey Dobriyan
Make sure that module won't load if sysctl table can't be registered, instead.
I fixed the patch to do so and handle another errors, too.
Subject: [PATCH] appletalk: handle errors during module_init
This patch makes aarp_proto_init() and atalk_register_sysctl() return error value to catch ENOMEM errors from module init call. Then it handles several errors in module_init and makes happen fail.
Also unnessesary SYSCTL ifdef in module_cleanup was removed.
include/linux/atalk.h | 6 ++--- net/appletalk/aarp.c | 12 ++++++---- net/appletalk/ddp.c | 45 ++++++++++++++++++++++++++++++++------- net/appletalk/sysctl_net_atalk.c | 3 +- 4 files changed, 49 insertions(+), 17 deletions(-)
net/appletalk/sysctl_net_atalk.c +2 -1
@@ -71,9 +71,10 @@ static struct ctl_table atalk_root_tablestatic struct ctl_table_header *atalk_table_header; -void atalk_register_sysctl (void ) +int atalk_register_sysctl (void ) { atalk_table_header =register_sysctl_table (atalk_root_table,1 ); +return (atalk_table_header ==NULL ) ? -ENOMEM :0 ; }void atalk_unregister_sysctl (void )
net/appletalk/ddp.c +37 -8
67 lines not on this page · raw message
include/linux/atalk.h +3 -3
@@ -147,7 +147,7 @@ static __inline__ struct elapaarp *aarp_#define AARP_RESOLVE_TIME (10 * HZ)extern struct datalink_proto *ddp_dl, *aarp_dl; -extern void aarp_proto_init (void ); +extern int aarp_proto_init (void );/* Inter module exports */
@@ -190,10 +190,10 @@ extern int sysctl_aarp_retransmit_limit;extern int sysctl_aarp_resolve_time;#ifdef CONFIG_SYSCTL -extern void atalk_register_sysctl (void ); +extern int atalk_register_sysctl (void );extern void atalk_unregister_sysctl (void );#else -#define atalk_register_sysctl () do { } while(0) +#define atalk_register_sysctl () ({ 0; })#define atalk_unregister_sysctl () do { } while(0)#endif
net/appletalk/aarp.c +7 -5
@@ -858,17 +858,19 @@ static struct notifier_block aarp_notifistatic unsigned char aarp_snap_id[] = {0x00 ,0x00 ,0x00 ,0x80 ,0xF3 }; -void __init aarp_proto_init (void ) +int __init aarp_proto_init (void ) { aarp_dl =register_snap_client (aarp_snap_id, aarp_rcv); -if (!aarp_dl) +if (!aarp_dl) {printk (KERN_CRIT "Unable to register AARP with SNAP.\n" ); -init_timer (&aarp_timer); - aarp_timer.function = aarp_expire_timeout; - aarp_timer.data =0 ; +return -ENOMEM ; + } +setup_timer (&aarp_timer, aarp_expire_timeout,0 ); aarp_timer.expires = jiffies + sysctl_aarp_expiry_time;add_timer (&aarp_timer);register_netdevice_notifier (&aarp_notifier); + +return 0 ; }/* Remove the AARP entries associated with a device. */