lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tipc: Fix log buffer memory leak if initialization fails

Browse Source 
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: Anders Kaseorg <andersk@ksplice.com>
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Anders Kaseorg
2010-08-17 11:00:03 +00:00
committed by David S. Miller
parent 24763d80fb
commit f813809252
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/tipc/core.c
View File

@@ -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)
{ {
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)
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);