Skip to content

Commit

Permalink
tipc: correct the order of stopping services at rmmod
Browse files Browse the repository at this point in the history
The 'signal handler' service in TIPC is a mechanism that makes it
possible to postpone execution of functions, by launcing them into
a job queue for execution in a separate tasklet, independent of
the launching execution thread.

When we do rmmod on the tipc module, this service is stopped after
the network service. At the same time, the stopping of the network
service may itself launch jobs for execution, with the risk that these
functions may be scheduled for execution after the data structures
meant to be accessed by the job have already been deleted. We have
seen this happen, most often resulting in an oops.

This commit ensures that the signal handler is the very first to be
stopped when TIPC is shut down, so there are no surprises during
the cleanup of the other services.

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jon Paul Maloy authored and David S. Miller committed Dec 11, 2013
1 parent 388d333 commit 993b858
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions net/tipc/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ int tipc_core_start_net(unsigned long addr)
static void tipc_core_stop(void)
{
tipc_netlink_stop();
tipc_handler_stop();
tipc_cfg_stop();
tipc_subscr_stop();
tipc_nametbl_stop();
Expand Down Expand Up @@ -146,9 +145,10 @@ static int tipc_core_start(void)
res = tipc_subscr_start();
if (!res)
res = tipc_cfg_init();
if (res)
if (res) {
tipc_handler_stop();
tipc_core_stop();

}
return res;
}

Expand Down Expand Up @@ -178,6 +178,7 @@ static int __init tipc_init(void)

static void __exit tipc_exit(void)
{
tipc_handler_stop();
tipc_core_stop_net();
tipc_core_stop();
pr_info("Deactivated\n");
Expand Down

0 comments on commit 993b858

Please sign in to comment.