Commit f8138092 authored by Anders Kaseorg's avatar Anders Kaseorg Committed by David S. Miller

tipc: Fix log buffer memory leak if initialization fails

Moves log buffer cleanup into tipc_core_stop() so that memory allocated
for the log buffer is freed if tipc_core_start() is unsuccessful.
Signed-off-by: default avatarAnders Kaseorg <andersk@ksplice.com>
Signed-off-by: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 24763d80
...@@ -169,6 +169,7 @@ void tipc_core_stop(void) ...@@ -169,6 +169,7 @@ void tipc_core_stop(void)
tipc_nametbl_stop(); tipc_nametbl_stop();
tipc_ref_table_stop(); tipc_ref_table_stop();
tipc_socket_stop(); tipc_socket_stop();
tipc_log_resize(0);
} }
/** /**
...@@ -203,7 +204,9 @@ static int __init tipc_init(void) ...@@ -203,7 +204,9 @@ static int __init tipc_init(void)
{ {
int res; int res;
tipc_log_resize(CONFIG_TIPC_LOG); if (tipc_log_resize(CONFIG_TIPC_LOG) != 0)
warn("Unable to create log buffer\n");
info("Activated (version " TIPC_MOD_VER info("Activated (version " TIPC_MOD_VER
" compiled " __DATE__ " " __TIME__ ")\n"); " compiled " __DATE__ " " __TIME__ ")\n");
...@@ -230,7 +233,6 @@ static void __exit tipc_exit(void) ...@@ -230,7 +233,6 @@ static void __exit tipc_exit(void)
tipc_core_stop_net(); tipc_core_stop_net();
tipc_core_stop(); tipc_core_stop();
info("Deactivated\n"); info("Deactivated\n");
tipc_log_resize(0);
} }
module_init(tipc_init); module_init(tipc_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment