p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tipc: fix cleanup at module unload 

In tipc_server_stop(), we iterate over the connections with limiting
factor as server's idr_in_use. We ignore the fact that this variable
is decremented in tipc_close_conn(), leading to premature exit.

In this commit, we iterate until the we have no connections left.

Acked-by: Ying Xue <ying.xue@windriver.com>
Acked-by: Jon Maloy <jon.maloy@ericsson.com>
Tested-by: John Thompson <thompa.atl@gmail.com>
Signed-off-by: Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Parthasarathy Bhuvaragan 2017-01-24 13:00:48 +01:00 committed by David S. Miller
parent 4c887aa65d
commit 35e22e49a5
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/tipc/server.c
View File

@ -619,14 +619,12 @@ int tipc_server_start(struct tipc_server *s)
void tipc_server_stop(struct tipc_server *s) void tipc_server_stop(struct tipc_server *s)
{ {
struct tipc_conn *con; struct tipc_conn *con;
int total = 0;
int id; int id;
spin_lock_bh(&s->idr_lock); spin_lock_bh(&s->idr_lock);
for (id = 0; total < s->idr_in_use; id++) { for (id = 0; s->idr_in_use; id++) {
con = idr_find(&s->conn_idr, id); con = idr_find(&s->conn_idr, id);
if (con) { if (con) {
total++;
spin_unlock_bh(&s->idr_lock); spin_unlock_bh(&s->idr_lock);
tipc_close_conn(con); tipc_close_conn(con);
spin_lock_bh(&s->idr_lock); spin_lock_bh(&s->idr_lock);